Allow getting the theme tint as a value so that it can be applied independent...

chrome/browser/browser_theme_provider.h

 // Copyright (c) 2009 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_BROWSER_THEME_PROVIDER_H_
 #define CHROME_BROWSER_BROWSER_THEME_PROVIDER_H_
 
 #include <map>
 #include <string>
 #include <vector>
@@ skipping 56 matching lines @@
   // ThemeProvider implementation.
   virtual SkBitmap* GetBitmapNamed(int id);
   virtual SkColor GetColor(int id);
   virtual bool GetDisplayProperty(int id, int* result);
   virtual bool ShouldUseNativeFrame();
   virtual bool HasCustomImage(int id);
 #if defined(OS_LINUX) && !defined(TOOLKIT_VIEWS)
   virtual GdkPixbuf* GetPixbufNamed(int id);
 #elif defined(OS_MACOSX)
   virtual NSImage* GetNSImageNamed(int id);
+  virtual NSColor* GetNSColorTint(int id);
 #endif
 
   // Set the current theme to the theme defined in |extension|.
   void SetTheme(Extension* extension);
 
   // Reset the theme to default.
   void UseDefaultTheme();
 
   // Convert a bitfield alignment into a string like "top left". Public so that
   // it can be used to generate CSS values. Takes a bitfield of AlignmentMasks.
@@ skipping 10 matching lines @@
   typedef std::map<const std::string, int> DisplayPropertyMap;
 
   // Reads the image data from the theme file into the specified vector. Returns
   // true on success.
   bool ReadThemeFileData(int id, std::vector<unsigned char>* raw_data);
 
   // Loads a bitmap from the theme, which may be tinted or
   // otherwise modified, or an application default.
   SkBitmap* LoadThemeBitmap(int id);
 
+  // Returns the string key for the given tint |id| TINT_* enum value.
+  const std::string GetTintKey(int id);
+
+  // Returns the default tint for the given tint |id| TINT_* enum value.
+  skia::HSL GetDefaultTint(int id);
+
   // Get the specified tint - |id| is one of the TINT_* enum values.
   skia::HSL GetTint(int id);
 
   // Tint |bitmap| with the tint specified by |hsl_id|
   SkBitmap TintBitmap(const SkBitmap& bitmap, int hsl_id);
 
   // The following load data from specified dictionaries (either from
   // preferences or from an extension manifest) and update our theme
   // data appropriately.
   // Allow any ResourceBundle image to be overridden. |images| should
@@ skipping 34 matching lines @@
 
   // Let all the browser views know that themes have changed.
   void NotifyThemeChanged();
 
   // Load theme data from preferences.
   void LoadThemePrefs();
 
   SkColor FindColor(const char* id, SkColor default_color);
 
   // Frees generated images and clears the image cache.
-  void FreeImages();
+  void ClearCaches();
 
-  // Clears the platform-specific image cache. Do not call directly; it's called
-  // from FreeImages().
-  void FreePlatformImages();
+  // Clears the platform-specific caches. Do not call directly; it's called
+  // from ClearCaches().
+  void FreePlatformCaches();
 
   // Cached images. We cache all retrieved and generated bitmaps and keep
   // track of the pointers. We own these and will delete them when we're done
   // using them.
   typedef std::map<int, SkBitmap*> ImageCache;
   ImageCache image_cache_;
 #if defined(OS_LINUX) && !defined(TOOLKIT_VIEWS)
   typedef std::map<int, GdkPixbuf*> GdkPixbufMap;
   GdkPixbufMap gdk_pixbufs_;
 #elif defined(OS_MACOSX)
   typedef std::map<int, NSImage*> NSImageMap;
   NSImageMap nsimage_cache_;
+  typedef std::map<int, NSColor*> NSColorMap;
+  NSColorMap nscolor_cache_;
 #endif
 
   ResourceBundle& rb_;
   Profile* profile_;
 
   ImageMap images_;
   ColorMap colors_;
   TintMap tints_;
   DisplayPropertyMap display_properties_;
 
   DISALLOW_COPY_AND_ASSIGN(BrowserThemeProvider);
 };
 
 #endif  // CHROME_BROWSER_BROWSER_THEME_PROVIDER_H_