Rejigger ThemeService: move exposure of ThemeProvider interface to a

chrome/browser/themes/theme_properties.h

Index: chrome/browser/themes/theme_properties.h
diff --git a/chrome/browser/themes/theme_properties.h b/chrome/browser/themes/theme_properties.h
index 4848cde20594fbb91df754b7ec6274cca89858b7..90f42f86d3d061f071f0e60fa9437d3888fede20 100644
--- a/chrome/browser/themes/theme_properties.h
+++ b/chrome/browser/themes/theme_properties.h
@@ -126,6 +126,13 @@ class ThemeProperties {
 #endif  // OS_MACOSX
   };
 
+  enum IncognitoThemeProperty {

[pkotwicz, 2015/12/04 23:16:49]

Nit: Please add a comment that the int value of the properties has no special
meaning

[Evan Stade, 2015/12/09 00:57:10]

Done.

+    COLOR_TOOLBAR_INCOGNITO = 2000,
+  };
+
+  static int IncognitoPropertyToProperty(int id);
+  static int PropertyToIncognitoProperty(int id);

[Peter Kasting, 2015/12/08 22:52:58]

If you follow my suggestion in theme_service.cc, I think the only usage of
IncognitoPropertyToProperty() goes away, and you're left with one usage of
PropertyToIncognitoProperty() inside ThemeService::GetColor().

At that point I think it would be better to eliminate this other function and do
the mapping directly there.  That basically encapsulates all the complication
about how colors are mapped inside ThemeService and leaves this class as a dumb
vendor.

[Evan Stade, 2015/12/09 00:57:10]

Done.

+
   // Used by the browser theme pack to parse alignments from something like
   // "top left" into a bitmask of Alignment.
   static int StringToAlignment(const std::string& alignment);