Rejigger ThemeService: move exposure of ThemeProvider interface to a

chrome/browser/themes/theme_properties.h

 // Copyright (c) 2013 The Chromium Authors. All rights reserved.
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
 #ifndef CHROME_BROWSER_THEMES_THEME_PROPERTIES_H_
 #define CHROME_BROWSER_THEMES_THEME_PROPERTIES_H_
 
 #include <set>
 #include <string>
 
@@ skipping 108 matching lines @@
     GRADIENT_FRAME_INCOGNITO_INACTIVE,
     GRADIENT_TOOLBAR,
     GRADIENT_TOOLBAR_INACTIVE,
     GRADIENT_TOOLBAR_BUTTON,
     GRADIENT_TOOLBAR_BUTTON_INACTIVE,
     GRADIENT_TOOLBAR_BUTTON_PRESSED,
     GRADIENT_TOOLBAR_BUTTON_PRESSED_INACTIVE,
 #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);
 
   // Used by the browser theme pack to parse alignments from something like
   // "no-repeat" into a Tiling value.
   static int StringToTiling(const std::string& tiling);
 
   // Converts a bitmask of Alignment into a string like "top left". The result
   // is used to generate a CSS value.
@@ skipping 13 matching lines @@
 
   // Returns the default color for the given color |id| COLOR_* enum value.
   // Returns gfx::kPlaceholderColor if |id| is invalid.
   static SkColor GetDefaultColor(int id);
 
  private:
   DISALLOW_IMPLICIT_CONSTRUCTORS(ThemeProperties);
 };
 
 #endif  // CHROME_BROWSER_THEMES_THEME_PROPERTIES_H_