Rejigger ThemeService: move exposure of ThemeProvider interface to a

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 2ea97c9665664505005d5235da1455845b743795..a4b95d813504073ca2b9cf6c78f700188868e064 100644
--- a/chrome/browser/themes/theme_properties.cc
+++ b/chrome/browser/themes/theme_properties.cc
@@ -45,6 +45,8 @@ const SkColor kDefaultColorToolbar = SkColorSetRGB(230, 230, 230);
 #else
 const SkColor kDefaultColorToolbar[] = {
     SkColorSetRGB(223, 223, 223), SkColorSetRGB(242, 242, 242)};
+const SkColor kDefaultColorToolbarIncognito[] = {
+    SkColorSetRGB(223, 223, 223), SkColorSetRGB(0x50, 0x50, 0x50)};
 #endif  // OS_MACOSX
 
 const SkColor kDefaultColorTabText = SK_ColorBLACK;
@@ -240,6 +242,10 @@ color_utils::HSL ThemeProperties::GetDefaultTint(int id) {
 
 // static
 SkColor ThemeProperties::GetDefaultColor(int id) {
+  return GetDefaultColor(id, false);
+}
+
+SkColor ThemeProperties::GetDefaultColor(int id, bool otr) {
   int mode = ui::MaterialDesignController::IsModeMaterial();
   switch (id) {
     // Properties stored in theme pack.
@@ -259,11 +265,13 @@ SkColor ThemeProperties::GetDefaultColor(int id) {
       return kDefaultColorFrameIncognito[mode];
     case COLOR_FRAME_INCOGNITO_INACTIVE:
       return kDefaultColorFrameIncognitoInactive[mode];
-    case COLOR_TOOLBAR:
 #if defined(OS_MACOSX)
+    case COLOR_TOOLBAR:
       return kDefaultColorToolbar;
 #else
-      return kDefaultColorToolbar[mode];
+    case COLOR_TOOLBAR:
+      return otr ? kDefaultColorToolbarIncognito[mode]
+                 : kDefaultColorToolbar[mode];
 #endif  // OS_MACOSX
     case COLOR_TAB_TEXT:
       return kDefaultColorTabText;