More pre-MD odds and ends.

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 30462989d5d967d1a095f9d342a01addbfe6d5ef..8838417c8ddc9dedfe95c844ba088deee0c30a51 100644
--- a/chrome/browser/themes/theme_properties.cc
+++ b/chrome/browser/themes/theme_properties.cc
@@ -26,76 +26,48 @@ namespace {
 // Default colors.
 #if defined(OS_MACOSX)
 // Used for theme fallback colors.
-const SkColor kDefaultColorFrame[] = {SkColorSetRGB(0xE0, 0xE0, 0xE0),
-                                      SkColorSetRGB(0xCC, 0xCC, 0xCC)};
-const SkColor kDefaultColorFrameInactive[] = {SkColorSetRGB(0xF6, 0xF6, 0xF6),
-                                              SkColorSetRGB(0xF6, 0xF6, 0xF6)};
+const SkColor kDefaultColorFrame = SkColorSetRGB(0xCC, 0xCC, 0xCC);

[Peter Kasting, 2016/10/26 03:28:47]

Nit: Can be moved above #if (common to both arms)

[Evan Stade, 2016/11/02 00:41:13]

Done.

+const SkColor kDefaultColorFrameInactive = SkColorSetRGB(0xF6, 0xF6, 0xF6);
 #else
-const SkColor kDefaultColorFrame[] = {SkColorSetRGB(0xC3, 0xC3, 0xC4),
-                                      SkColorSetRGB(0xCC, 0xCC, 0xCC)};
-const SkColor kDefaultColorFrameInactive[] = {SkColorSetRGB(0xCD, 0xCD, 0xCE),
-                                              SkColorSetRGB(0xDC, 0xDC, 0xDC)};
+const SkColor kDefaultColorFrame = SkColorSetRGB(0xCC, 0xCC, 0xCC);
+const SkColor kDefaultColorFrameInactive = SkColorSetRGB(0xDC, 0xDC, 0xDC);
 #endif
 
 // These colors are the same between CrOS and !CrOS for MD, so this ifdef can be
 // removed when we stop supporting pre-MD.
 #if defined(OS_CHROMEOS)

[Peter Kasting, 2016/10/26 03:28:47]

Nit: This arm can be removed (same as arm below Mac)

[Evan Stade, 2016/11/02 00:41:13]

Done.

-const SkColor kDefaultColorFrameIncognito[] = {SkColorSetRGB(0xA0, 0xA0, 0xA4),
-                                               SkColorSetRGB(0x28, 0x2B, 0x2D)};
-const SkColor kDefaultColorFrameIncognitoInactive[] = {
-    SkColorSetRGB(0xAA, 0xAA, 0xAE), SkColorSetRGB(0x38, 0x3B, 0x3D)};
+const SkColor kDefaultColorFrameIncognito = SkColorSetRGB(0x28, 0x2B, 0x2D);
+const SkColor kDefaultColorFrameIncognitoInactive =
+    SkColorSetRGB(0x38, 0x3B, 0x3D);
 #elif defined(OS_MACOSX)
-const SkColor kDefaultColorFrameIncognito[] = {
-    gfx::kPlaceholderColor, SkColorSetARGB(0xE6, 0x14, 0x16, 0x18)};
-const SkColor kDefaultColorFrameIncognitoInactive[] = {
-    gfx::kPlaceholderColor, SkColorSetRGB(0x1E, 0x1E, 0x1E)};
+const SkColor kDefaultColorFrameIncognito =
+    SkColorSetARGB(0xE6, 0x14, 0x16, 0x18);
+const SkColor kDefaultColorFrameIncognitoInactive =
+    SkColorSetRGB(0x1E, 0x1E, 0x1E);
 #else
-const SkColor kDefaultColorFrameIncognito[] = {SkColorSetRGB(0x53, 0x6A, 0x8B),
-                                               SkColorSetRGB(0x28, 0x2B, 0x2D)};
-const SkColor kDefaultColorFrameIncognitoInactive[] = {
-    SkColorSetRGB(0x7E, 0x8B, 0x9C), SkColorSetRGB(0x38, 0x3B, 0x3D)};
+const SkColor kDefaultColorFrameIncognito = SkColorSetRGB(0x28, 0x2B, 0x2D);
+const SkColor kDefaultColorFrameIncognitoInactive =
+    SkColorSetRGB(0x38, 0x3B, 0x3D);
 #endif
 
-#if defined(OS_MACOSX)
-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)};
+const SkColor kDefaultColorToolbar = SkColorSetRGB(0xF2, 0xF2, 0xF2);
+const SkColor kDefaultColorToolbarIncognito = SkColorSetRGB(0x50, 0x50, 0x50);
 
-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
-const SkColor kDefaultColorBackgroundTabText[] = {
-    SkColorSetRGB(0x40, 0x40, 0x40), SK_ColorBLACK};
-const SkColor kDefaultColorBackgroundTabTextIncognito[] = {
-    SkColorSetRGB(0x40, 0x40, 0x40), SK_ColorWHITE};
-#endif  // OS_MACOSX
+const SkColor kDefaultDetachedBookmarkBarBackground = SK_ColorWHITE;
+const SkColor kDefaultDetachedBookmarkBarBackgroundIncognito =
+    SkColorSetRGB(0x32, 0x32, 0x32);
 
+constexpr SkColor kDefaultColorTabText = SK_ColorBLACK;
+constexpr SkColor kDefaultColorTabTextIncognito = SK_ColorWHITE;
+constexpr SkColor kDefaultColorBackgroundTabText = SK_ColorBLACK;
+constexpr SkColor kDefaultColorBackgroundTabTextIncognito = SK_ColorWHITE;
 constexpr SkColor kDefaultColorBookmarkText = SK_ColorBLACK;
-constexpr SkColor kDefaultColorBookmarkTextIncognito[] = {
-    kDefaultColorBookmarkText, SK_ColorWHITE};
+constexpr SkColor kDefaultColorBookmarkTextIncognito = SK_ColorWHITE;

[Peter Kasting, 2016/10/26 03:28:46]

Nit: I'm kinda inclined to combine the tab and bookmark text color constants,
but I don't have a good name.

[Evan Stade, 2016/11/02 00:41:13]

Done. (ToolbarText)

 
-const SkColor kDefaultColorBookmarkInstructionsText[] = {
-    SK_ColorBLACK, SkColorSetRGB(0x64, 0x64, 0x64)};
-const SkColor kDefaultColorBookmarkInstructionsTextIncognito[] = {
-    SK_ColorBLACK, SkColorSetARGB(0x8A, 0xFF, 0xFF, 0xFF)};
+const SkColor kDefaultColorBookmarkInstructionsText =
+    SkColorSetRGB(0x64, 0x64, 0x64);
+const SkColor kDefaultColorBookmarkInstructionsTextIncognito =
+    SkColorSetARGB(0x8A, 0xFF, 0xFF, 0xFF);

[Peter Kasting, 2016/10/26 03:28:47]

Nit: SkColorSetA(SK_ColorWHITE, 0x8A)

Or maybe (kDefaultColorBookmarkTextIncognito, 0x8A), but then it's kinda weird
that the non-incognito version isn't defined in terms of
kDefaultColorBookmarkText.

[Evan Stade, 2016/11/02 00:41:13]

Done.

 
 #if defined(OS_WIN)
 const SkColor kDefaultColorNTPBackground =
@@ -118,8 +90,7 @@ 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 kDefaultTintButtonsIncognito = {-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};
@@ -130,34 +101,34 @@ 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 kDefaultDetachedBookmarkBarSeparator =
+    SkColorSetRGB(0xB6, 0xB4, 0xB6);
+const SkColor kDefaultDetachedBookmarkBarSeparatorIncognito =
+    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[] = {
-    gfx::kPlaceholderColor, SkColorSetRGB(0xF6, 0xF6, 0xF6)};
-const SkColor kDefaultColorToolbarInactiveIncognito[] = {
-    gfx::kPlaceholderColor, SkColorSetRGB(0x2D, 0x2D, 0x2D)};
-const SkColor kDefaultColorTabBackgroundInactive[] = {
-    gfx::kPlaceholderColor, SkColorSetRGB(0xEC, 0xEC, 0xEC)};
-const SkColor kDefaultColorTabBackgroundInactiveIncognito[] = {
-    gfx::kPlaceholderColor, SkColorSetRGB(0x28, 0x28, 0x28)};
+const SkColor kDefaultColorFrameVibrancyOverlay =
+    SkColorSetA(SK_ColorBLACK, 0x19);
+const SkColor kDefaultColorFrameVibrancyOverlayIncognito =
+    SkColorSetARGB(0xE6, 0x14, 0x16, 0x18);
+const SkColor kDefaultColorToolbarInactive = SkColorSetRGB(0xF6, 0xF6, 0xF6);
+const SkColor kDefaultColorToolbarInactiveIncognito =
+    SkColorSetRGB(0x2D, 0x2D, 0x2D);
+const SkColor kDefaultColorTabBackgroundInactive =
+    SkColorSetRGB(0xEC, 0xEC, 0xEC);
+const SkColor kDefaultColorTabBackgroundInactiveIncognito =
+    SkColorSetRGB(0x28, 0x28, 0x28);
 const SkColor kDefaultColorToolbarButtonStroke =
     SkColorSetARGB(0x4B, 0x51, 0x51, 0x51);
 const SkColor kDefaultColorToolbarButtonStrokeInactive =
     SkColorSetARGB(0x4B, 0x63, 0x63, 0x63);
 const SkColor kDefaultColorToolbarBezel = SkColorSetRGB(0xCC, 0xCC, 0xCC);
-const SkColor kDefaultColorToolbarStroke[] = {SkColorSetRGB(0x67, 0x67, 0x67),
-                                              SkColorSetA(SK_ColorBLACK, 0x4C)};
+const SkColor kDefaultColorToolbarStroke = SkColorSetA(SK_ColorBLACK, 0x4C);
 const SkColor kDefaultColorToolbarStrokeInactive =
     SkColorSetRGB(0xA3, 0xA3, 0xA3);
-const SkColor kDefaultColorToolbarIncognitoStroke[] = {
-    SkColorSetRGB(0x67, 0x67, 0x67), SkColorSetA(SK_ColorBLACK, 0x3F)};
+const SkColor kDefaultColorToolbarIncognitoStroke =
+    SkColorSetA(SK_ColorBLACK, 0x3F);
 const SkColor kDefaultColorToolbarStrokeTheme =
     SkColorSetA(SK_ColorWHITE, 0x66);
 const SkColor kDefaultColorToolbarStrokeThemeInactive =
@@ -253,10 +224,8 @@ color_utils::HSL ThemeProperties::GetDefaultTint(int id, bool otr) {
     case TINT_FRAME_INACTIVE:
       return otr ? kDefaultTintFrameIncognitoInactive
                  : kDefaultTintFrameInactive;
-    case TINT_BUTTONS: {
-      const int mode = ui::MaterialDesignController::IsModeMaterial();
-      return otr ? kDefaultTintButtonsIncognito[mode] : kDefaultTintButtons;
-    }
+    case TINT_BUTTONS:
+      return otr ? kDefaultTintButtonsIncognito : kDefaultTintButtons;
     case TINT_BACKGROUND_TAB:
       return kDefaultTintBackgroundTab;
     case TINT_FRAME_INCOGNITO:
@@ -271,25 +240,22 @@ color_utils::HSL ThemeProperties::GetDefaultTint(int id, bool otr) {
 
 // static
 SkColor ThemeProperties::GetDefaultColor(int id, bool otr) {
-  int mode = ui::MaterialDesignController::IsModeMaterial();
   switch (id) {
     // Properties stored in theme pack.
     case COLOR_FRAME:
-      return otr ? kDefaultColorFrameIncognito[mode] : kDefaultColorFrame[mode];
+      return otr ? kDefaultColorFrameIncognito : kDefaultColorFrame;
     case COLOR_FRAME_INACTIVE:
-      return otr ? kDefaultColorFrameIncognitoInactive[mode]
-                 : kDefaultColorFrameInactive[mode];
+      return otr ? kDefaultColorFrameIncognitoInactive
+                 : kDefaultColorFrameInactive;
     case COLOR_TOOLBAR:
-      return otr ? kDefaultColorToolbarIncognito[mode]
-                 : kDefaultColorToolbar[mode];
+      return otr ? kDefaultColorToolbarIncognito : kDefaultColorToolbar;
     case COLOR_TAB_TEXT:
-      return otr ? kDefaultColorTabTextIncognito[mode]
-                 : kDefaultColorTabText;
+      return otr ? kDefaultColorTabTextIncognito : kDefaultColorTabText;
     case COLOR_BACKGROUND_TAB_TEXT:
-      return otr ? kDefaultColorBackgroundTabTextIncognito[mode]
-                 : kDefaultColorBackgroundTabText[mode];
+      return otr ? kDefaultColorBackgroundTabTextIncognito
+                 : kDefaultColorBackgroundTabText;
     case COLOR_BOOKMARK_TEXT:
-      return otr ? kDefaultColorBookmarkTextIncognito[mode]
+      return otr ? kDefaultColorBookmarkTextIncognito
                  : kDefaultColorBookmarkText;
     case COLOR_NTP_BACKGROUND:
       return kDefaultColorNTPBackground;
@@ -316,27 +282,28 @@ SkColor ThemeProperties::GetDefaultColor(int id, bool otr) {
     case COLOR_CONTROL_BACKGROUND:
       return kDefaultColorControlBackground;
     case COLOR_BOOKMARK_BAR_INSTRUCTIONS_TEXT:
-      return otr ? kDefaultColorBookmarkInstructionsTextIncognito[mode]
-                 : kDefaultColorBookmarkInstructionsText[mode];
+      return otr ? kDefaultColorBookmarkInstructionsTextIncognito
+                 : kDefaultColorBookmarkInstructionsText;
     case COLOR_TOOLBAR_BOTTOM_SEPARATOR:
     case COLOR_DETACHED_BOOKMARK_BAR_SEPARATOR:
-      return otr ? kDefaultDetachedBookmarkBarSeparatorIncognito[mode]
-                 : kDefaultDetachedBookmarkBarSeparator[mode];
+      return otr ? kDefaultDetachedBookmarkBarSeparatorIncognito
+                 : kDefaultDetachedBookmarkBarSeparator;
     case COLOR_DETACHED_BOOKMARK_BAR_BACKGROUND:
-      return otr ? kDefaultDetachedBookmarkBarBackgroundIncognito[mode]
-                 : kDefaultDetachedBookmarkBarBackground[mode];
+      return otr ? kDefaultDetachedBookmarkBarBackgroundIncognito
+                 : kDefaultDetachedBookmarkBarBackground;
     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];
+      return otr ? kDefaultColorFrameVibrancyOverlayIncognito
+                 : kDefaultColorFrameVibrancyOverlay;
     case COLOR_TOOLBAR_INACTIVE:
-      return otr ? kDefaultColorToolbarInactiveIncognito[mode]
-                 : kDefaultColorToolbarInactive[mode];
+      return otr ? kDefaultColorToolbarInactiveIncognito
+                 : kDefaultColorToolbarInactive;
     case COLOR_BACKGROUND_TAB_INACTIVE:
-      return otr ? kDefaultColorTabBackgroundInactiveIncognito[mode]
-                 : kDefaultColorTabBackgroundInactive[mode];
+      return otr ? kDefaultColorTabBackgroundInactiveIncognito
+                 : kDefaultColorTabBackgroundInactive;
     case COLOR_TOOLBAR_BUTTON_STROKE:
       return kDefaultColorToolbarButtonStroke;
     case COLOR_TOOLBAR_BUTTON_STROKE_INACTIVE:
@@ -344,8 +311,8 @@ SkColor ThemeProperties::GetDefaultColor(int id, bool otr) {
     case COLOR_TOOLBAR_BEZEL:
       return kDefaultColorToolbarBezel;
     case COLOR_TOOLBAR_STROKE:
-      return otr ? kDefaultColorToolbarIncognitoStroke[mode]
-                 : kDefaultColorToolbarStroke[mode];
+      return otr ? kDefaultColorToolbarIncognitoStroke
+                 : kDefaultColorToolbarStroke;
     case COLOR_TOOLBAR_STROKE_INACTIVE:
       return kDefaultColorToolbarStrokeInactive;
     case COLOR_TOOLBAR_STROKE_THEME: