Reland: Replace CONTROL_BACKGROUND and DETACHED_BOOKMARK_BAR_BACKGROUND by COLOR_NTP_BACKGROUND

chrome/browser/themes/theme_properties.cc

 // Copyright (c) 2013 The Chromium Authors. All rights reserved.
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
 #include "chrome/browser/themes/theme_properties.h"
 
 #include <memory>
 
 #include "base/macros.h"
 #include "base/strings/string_split.h"
@@ skipping 49 matching lines @@
 const SkColor kDefaultColorToolbar[] = {SkColorSetRGB(0xE6, 0xE6, 0xE6),
                                         SkColorSetRGB(0xF2, 0xF2, 0xF2)};
 const SkColor kDefaultColorToolbarIncognito[] = {
     SkColorSetRGB(0xE6, 0xE6, 0xE6), SkColorSetRGB(0x50, 0x50, 0x50)};
 #else
 const SkColor kDefaultColorToolbar[] = {SkColorSetRGB(0xDF, 0xDF, 0xDF),
                                         SkColorSetRGB(0xF2, 0xF2, 0xF2)};
 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};
 
 #if defined(OS_MACOSX)
 constexpr SkColor kDefaultColorBackgroundTabText[] = {SK_ColorBLACK,
                                                       SK_ColorBLACK};
 constexpr SkColor kDefaultColorBackgroundTabTextIncognito[] = {
     kDefaultColorBackgroundTabText[0], SK_ColorWHITE};
 #else
@@ skipping 17 matching lines @@
     color_utils::GetSysSkColor(COLOR_WINDOW);
 const SkColor kDefaultColorNTPText =
     color_utils::GetSysSkColor(COLOR_WINDOWTEXT);
 const SkColor kDefaultColorNTPLink = color_utils::GetSysSkColor(COLOR_HOTLIGHT);
 #else
 // TODO(beng): source from theme provider.
 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, not Text.

+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
kDefaultColorBookmarkInstructionsTextIncognito?

 
 const SkColor kDefaultColorNTPHeader = SkColorSetRGB(0x96, 0x96, 0x96);
 const SkColor kDefaultColorNTPSection = SkColorSetRGB(0xE5, 0xE5, 0xE5);
 constexpr SkColor kDefaultColorNTPSectionText = SK_ColorBLACK;
 const SkColor kDefaultColorNTPSectionLink = SkColorSetRGB(0x06, 0x37, 0x74);
 constexpr SkColor kDefaultColorButtonBackground = SK_ColorTRANSPARENT;
 
 // Default tints.
 constexpr color_utils::HSL kDefaultTintButtons = {-1, -1, -1};
 constexpr color_utils::HSL kDefaultTintButtonsIncognito[] = {
     kDefaultTintButtons, {-1, -1, 0.85}};
 constexpr color_utils::HSL kDefaultTintFrame = {-1, -1, -1};
 constexpr color_utils::HSL kDefaultTintFrameInactive = {-1, -1, 0.75};
 constexpr color_utils::HSL kDefaultTintFrameIncognito = {-1, 0.2, 0.35};
 constexpr color_utils::HSL kDefaultTintFrameIncognitoInactive = {-1, 0.3, 0.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[] = {
     SkColorSetRGB(0xAA, 0xAA, 0xAB), SkColorSetRGB(0x28, 0x28, 0x28)};
 const SkColor kDefaultToolbarTopSeparator = SkColorSetA(SK_ColorBLACK, 0x40);
 
 #if defined(OS_MACOSX)
 const SkColor kDefaultColorFrameVibrancyOverlay[] = {
     SkColorSetA(SK_ColorBLACK, 0x19), SkColorSetARGB(0xE6, 0x14, 0x16, 0x18)};
 const SkColor kDefaultColorToolbarInactive[] = {
@@ skipping 190 matching lines @@
     case COLOR_TAB_TEXT:
       return otr ? kDefaultColorTabTextIncognito[mode]
                  : kDefaultColorTabText;
     case COLOR_BACKGROUND_TAB_TEXT:
       return otr ? kDefaultColorBackgroundTabTextIncognito[mode]
                  : kDefaultColorBackgroundTabText[mode];
     case COLOR_BOOKMARK_TEXT:
       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 always the normal NTP text
color?  Did our incognito NTP just ignore that value?  Seems like it would have
had to, and that that should be fixed.

     case COLOR_NTP_LINK:
       return kDefaultColorNTPLink;
     case COLOR_NTP_LINK_UNDERLINE:
       return TintForUnderline(kDefaultColorNTPLink);
     case COLOR_NTP_HEADER:
       return kDefaultColorNTPHeader;
     case COLOR_NTP_SECTION:
       return kDefaultColorNTPSection;
     case COLOR_NTP_SECTION_TEXT:
       return kDefaultColorNTPSectionText;
     case COLOR_NTP_SECTION_LINK:
       return kDefaultColorNTPSectionLink;
     case COLOR_NTP_SECTION_LINK_UNDERLINE:
       return TintForUnderline(kDefaultColorNTPSectionLink);
     case COLOR_BUTTON_BACKGROUND:
       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];
     case COLOR_TOOLBAR_BOTTOM_SEPARATOR:
     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;
 #if defined(OS_MACOSX)
     case COLOR_FRAME_VIBRANCY_OVERLAY:
       return kDefaultColorFrameVibrancyOverlay[otr];
     case COLOR_TOOLBAR_INACTIVE:
       return otr ? kDefaultColorToolbarInactiveIncognito[mode]
                  : kDefaultColorToolbarInactive[mode];
     case COLOR_BACKGROUND_TAB_INACTIVE:
@@ skipping 17 matching lines @@
 #endif
     case COLOR_FRAME_INCOGNITO:
     case COLOR_FRAME_INCOGNITO_INACTIVE:
       NOTREACHED() << "These values should be queried via their respective "
                       "non-incognito equivalents and an appropriate |otr| "
                       "value.";
     default:
       return gfx::kPlaceholderColor;
   }
 }