Revert of Replace CONTROL_BACKGROUND and DETACHED_BOOKMARK_BAR_BACKGROUND by COLOR_NTP_BACKGROUND

chrome/browser/themes/theme_properties.cc

Index: chrome/browser/themes/theme_properties.cc
diff --git a/chrome/browser/themes/theme_properties.cc b/chrome/browser/themes/theme_properties.cc
index d6b7bedfd3c60b74d869612b427e1961c2e9961e..ba17e76085d79258360c4abb6c77d9830be12987 100644
--- a/chrome/browser/themes/theme_properties.cc
+++ b/chrome/browser/themes/theme_properties.cc
@@ -67,6 +67,11 @@
 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};
@@ -124,6 +129,7 @@
 // ----------------------------------------------------------------------------
 // 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[] = {
@@ -355,6 +361,8 @@
       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];
@@ -362,6 +370,9 @@
     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;