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..b30614a677df4a9aaa438fe78f1d9a04655ff57e 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;
@@ -145,6 +147,26 @@ SkColor TintForUnderline(SkColor input) {
 }  // namespace
 
 // static
+int ThemeProperties::IncognitoPropertyToProperty(int id) {
+  switch (id) {
+    case COLOR_TOOLBAR_INCOGNITO:
+      return COLOR_TOOLBAR;
+    default:
+      return id;
+  }
+}
+
+// static
+int ThemeProperties::PropertyToIncognitoProperty(int id) {
+  switch (id) {
+    case COLOR_TOOLBAR:
+      return COLOR_TOOLBAR_INCOGNITO;
+    default:
+      return id;
+  }
+}
+
+// static
 int ThemeProperties::StringToAlignment(const std::string& alignment) {
   int alignment_mask = 0;
   for (const std::string& component : base::SplitString(
@@ -259,11 +281,15 @@ 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:
+    case COLOR_TOOLBAR_INCOGNITO:
       return kDefaultColorToolbar;
 #else
+    case COLOR_TOOLBAR:
       return kDefaultColorToolbar[mode];
+    case COLOR_TOOLBAR_INCOGNITO:
+      return kDefaultColorToolbarIncognito[mode];
 #endif  // OS_MACOSX
     case COLOR_TAB_TEXT:
       return kDefaultColorTabText;