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