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..84c2bf34db49cda4509f99895e13df266205b0d6 100644
--- a/chrome/browser/themes/theme_properties.h
+++ b/chrome/browser/themes/theme_properties.h
@@ -126,6 +126,14 @@ class ThemeProperties {
 #endif  // OS_MACOSX
   };
 
+  // The int value has no special meaning, but should not conflict with
+  // the other property enums above.
+  enum IncognitoThemeProperty {
+    COLOR_TOOLBAR_INCOGNITO = 2000,
+  };
+
+  static int PropertyToIncognitoProperty(int id);

[Peter Kasting, 2015/12/09 01:31:59]

I thought you were going to eliminate this function and move its functionality
inside ThemeService::GetColor()?  That had been the intent of my suggestion
anyway...

[Evan Stade, 2015/12/09 01:57:06]

ah, ok, I guess we can do that. I thought you just wanted to delete one of the
two new functions. In fact we might be better off making GetDefaultColor take an
otr bool parameter and not convert at all in ThemeService? At least then we
could make the IncognitoThemeProperty enum private. It's hard for me to judge
whether that will be sufficient for all future purposes.

+
   // 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);