Index: chrome/browser/themes/theme_properties.cc |
diff --git a/chrome/browser/themes/theme_properties.cc b/chrome/browser/themes/theme_properties.cc |
index ba17e76085d79258360c4abb6c77d9830be12987..a2d41be67fa7591fafa2c5e8ee9454ba1bdecfb1 100644 |
--- a/chrome/browser/themes/theme_properties.cc |
+++ b/chrome/browser/themes/theme_properties.cc |
@@ -67,11 +67,6 @@ const SkColor kDefaultColorToolbar[] = {SkColorSetRGB(0xDF, 0xDF, 0xDF), |
const SkColor kDefaultColorToolbarIncognito[] = { |
SkColorSetRGB(0xDF, 0xDF, 0xDF), SkColorSetRGB(0x50, 0x50, 0x50)}; |
#endif // OS_MACOSX |
-const SkColor kDefaultDetachedBookmarkBarBackground[] = { |
- SkColorSetRGB(0xF1, 0xF1, 0xF1), SK_ColorWHITE}; |
-const SkColor kDefaultDetachedBookmarkBarBackgroundIncognito[] = { |
- SkColorSetRGB(0xF1, 0xF1, 0xF1), SkColorSetRGB(0x32, 0x32, 0x32)}; |
- |
constexpr SkColor kDefaultColorTabText = SK_ColorBLACK; |
constexpr SkColor kDefaultColorTabTextIncognito[] = {kDefaultColorTabText, |
SK_ColorWHITE}; |
@@ -109,6 +104,10 @@ constexpr SkColor kDefaultColorNTPBackground = SK_ColorWHITE; |
constexpr SkColor kDefaultColorNTPText = SK_ColorBLACK; |
const SkColor kDefaultColorNTPLink = SkColorSetRGB(0x06, 0x37, 0x74); |
#endif // OS_WIN |
+const SkColor kDefaultColorNTPBackgroundIncognito[] = { |
+ kDefaultColorNTPText, SkColorSetRGB(0x32, 0x32, 0x32)}; |
Peter Kasting
2016/08/18 09:12:36
I think you meant kDefaultColorNTPBackground here,
|
+const SkColor kDefaultColorNTPTextIncognito[] = { |
+ kDefaultColorNTPText, SkColorSetARGB(0x8A, 0xFF, 0xFF, 0xFF)}; |
Peter Kasting
2016/08/18 09:12:36
Is this latter value supposed to stay in sync with
|
const SkColor kDefaultColorNTPHeader = SkColorSetRGB(0x96, 0x96, 0x96); |
const SkColor kDefaultColorNTPSection = SkColorSetRGB(0xE5, 0xE5, 0xE5); |
@@ -129,7 +128,6 @@ constexpr color_utils::HSL kDefaultTintBackgroundTab = {-1, -1, 0.75}; |
// ---------------------------------------------------------------------------- |
// Defaults for properties which are not stored in the browser theme pack. |
-constexpr SkColor kDefaultColorControlBackground = SK_ColorWHITE; |
const SkColor kDefaultDetachedBookmarkBarSeparator[] = { |
SkColorSetRGB(0xAA, 0xAA, 0xAB), SkColorSetRGB(0xB6, 0xB4, 0xB6)}; |
const SkColor kDefaultDetachedBookmarkBarSeparatorIncognito[] = { |
@@ -340,9 +338,10 @@ SkColor ThemeProperties::GetDefaultColor(int id, bool otr) { |
return otr ? kDefaultColorBookmarkTextIncognito[mode] |
: kDefaultColorBookmarkText; |
case COLOR_NTP_BACKGROUND: |
- return kDefaultColorNTPBackground; |
+ return otr ? kDefaultColorNTPBackgroundIncognito[mode] |
+ : kDefaultColorNTPBackground; |
case COLOR_NTP_TEXT: |
- return kDefaultColorNTPText; |
+ return otr ? kDefaultColorNTPTextIncognito[mode] : kDefaultColorNTPText; |
Peter Kasting
2016/08/18 09:12:36
So before this change was the incognito NTP text a
|
case COLOR_NTP_LINK: |
return kDefaultColorNTPLink; |
case COLOR_NTP_LINK_UNDERLINE: |
@@ -361,8 +360,6 @@ SkColor ThemeProperties::GetDefaultColor(int id, bool otr) { |
return kDefaultColorButtonBackground; |
// Properties not stored in theme pack. |
- case COLOR_CONTROL_BACKGROUND: |
- return kDefaultColorControlBackground; |
case COLOR_BOOKMARK_BAR_INSTRUCTIONS_TEXT: |
return otr ? kDefaultColorBookmarkInstructionsTextIncognito[mode] |
: kDefaultColorBookmarkInstructionsText[mode]; |
@@ -370,9 +367,6 @@ SkColor ThemeProperties::GetDefaultColor(int id, bool otr) { |
case COLOR_DETACHED_BOOKMARK_BAR_SEPARATOR: |
return otr ? kDefaultDetachedBookmarkBarSeparatorIncognito[mode] |
: kDefaultDetachedBookmarkBarSeparator[mode]; |
- case COLOR_DETACHED_BOOKMARK_BAR_BACKGROUND: |
- return otr ? kDefaultDetachedBookmarkBarBackgroundIncognito[mode] |
- : kDefaultDetachedBookmarkBarBackground[mode]; |
case COLOR_TOOLBAR_TOP_SEPARATOR: |
case COLOR_TOOLBAR_TOP_SEPARATOR_INACTIVE: |
return kDefaultToolbarTopSeparator; |