Merge 23023 - Allow theming of colors for the Mac....

chrome/browser/browser_theme_provider.h

Index: chrome/browser/browser_theme_provider.h
===================================================================
--- chrome/browser/browser_theme_provider.h	(revision 23163)
+++ chrome/browser/browser_theme_provider.h	(working copy)
@@ -160,6 +160,7 @@
   virtual GdkPixbuf* GetRTLEnabledPixbufNamed(int id);
 #elif defined(OS_MACOSX)
   virtual NSImage* GetNSImageNamed(int id);
+  virtual NSColor* GetNSColor(int id);
   virtual NSColor* GetNSColorTint(int id);
 #endif
 
@@ -242,6 +243,12 @@
   // Returns the default tint for the given tint |id| TINT_* enum value.
   skia::HSL GetDefaultTint(int id);
 
+  // Returns the string key for the given color |id| COLOR_* enum value.
+  const std::string GetColorKey(int id);
+
+  // Returns the default color for the given color |id| COLOR_* enum value.
+  SkColor GetDefaultColor(int id);
+
   // Get the specified tint - |id| is one of the TINT_* enum values.
   skia::HSL GetTint(int id);
 
@@ -283,8 +290,6 @@
   // Save the id of the last theme installed.
   void SaveThemeID(const std::string& id);
 
-  SkColor FindColor(const char* id, SkColor default_color);
-
   // Frees generated images and clears the image cache.
   void ClearCaches();
 
Property changes on: chrome\browser\browser_theme_provider.h
___________________________________________________________________
Modified: svn:mergeinfo
   Merged /trunk/src/chrome/browser/browser_theme_provider.h:r23023