Allow the Mac theme provider to give default colors/tints if requested.

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 <set>
 #include <string>
 
 #include "app/theme_provider.h"
 #include "base/non_thread_safe.h"
 #include "base/ref_counted.h"
 
 namespace color_utils {
   struct HSL;
 }
 
 class BrowserThemePack;
 class BrowserThemeProviderTest;
 class DictionaryValue;
 class Extension;
 class FilePath;
 class PrefService;
 class Profile;
 class ResourceBundle;
 
+#ifdef __OBJC__
+@class NSString;
+// Sent whenever the browser theme changes.  Object => NSValue wrapping the
+// BrowserThemeProvider that changed.
+extern "C" NSString* const kBrowserThemeDidChangeNotification;
+#endif  // __OBJC__
+
 class BrowserThemeProvider : public NonThreadSafe,
                              public ThemeProvider {
  public:
   // Public constants used in BrowserThemeProvider and its subclasses:
 
   // Strings used in alignment properties.
   static const char* kAlignmentTop;
   static const char* kAlignmentBottom;
   static const char* kAlignmentLeft;
   static const char* kAlignmentRight;
@@ skipping 65 matching lines @@
   virtual SkBitmap* GetBitmapNamed(int id) const;
   virtual SkColor GetColor(int id) const;
   virtual bool GetDisplayProperty(int id, int* result) const;
   virtual bool ShouldUseNativeFrame() const;
   virtual bool HasCustomImage(int id) const;
   virtual RefCountedMemory* GetRawData(int id) const;
 #if defined(OS_LINUX)
   virtual GdkPixbuf* GetPixbufNamed(int id) const;
   virtual GdkPixbuf* GetRTLEnabledPixbufNamed(int id) const;
 #elif defined(OS_MACOSX)
-  virtual NSImage* GetNSImageNamed(int id) const;
-  virtual NSColor* GetNSColor(int id) const;
-  virtual NSColor* GetNSColorTint(int id) const;
+  virtual NSImage* GetNSImageNamed(int id, bool allow_default) const;

[Nico, 2010/02/17 22:22:40]

How about using an enum instead of a bool? Makes the calling sites nicer:

  frobonator->GetNSImageNamed(theImage, kDefaultImage);
  frobonator->GetNSImageNamed(theImage, kDefaultAsNull);

+  virtual NSColor* GetNSColor(int id, bool allow_default) const;
+  virtual NSColor* GetNSColorTint(int id, bool allow_default) const;
 #endif
 
   // Set the current theme to the theme defined in |extension|.
   virtual void SetTheme(Extension* extension);
 
   // Reset the theme to default.
   virtual void UseDefaultTheme();
 
   // Set the current theme to the native theme. On some platforms, the native
   // theme is the default theme.
@@ skipping 48 matching lines @@
 
   // Clears all the override fields and saves the dictionary.
   virtual void ClearAllThemeData();
 
   // Load theme data from preferences.
   virtual void LoadThemePrefs();
 
   // Let all the browser views know that themes have changed.
   virtual void NotifyThemeChanged();
 
+#if defined(OS_MACOSX)
+  // Let all the browser views know that themes have changed in a platform way.
+  virtual void NotifyPlatformThemeChanged();
+#endif  // OS_MACOSX
+
   // Clears the platform-specific caches. Do not call directly; it's called
   // from ClearCaches().
   virtual void FreePlatformCaches();
 
   Profile* profile() { return profile_; }
 
  private:
   friend class BrowserThemeProviderTest;
 
   // Saves the filename of the cached theme pack.
@@ skipping 13 matching lines @@
   // Loads an image and flips it horizontally if |rtl_enabled| is true.
   GdkPixbuf* GetPixbufImpl(int id, bool rtl_enabled) const;
 #endif
 
 #if defined(OS_LINUX)
   typedef std::map<int, GdkPixbuf*> GdkPixbufMap;
   mutable GdkPixbufMap gdk_pixbufs_;
 #elif defined(OS_MACOSX)
   typedef std::map<int, NSImage*> NSImageMap;
   mutable NSImageMap nsimage_cache_;
-  typedef std::map<int, NSColor*> NSColorMap;
+  // The bool member of the pair is whether the color is a default color.
+  typedef std::map<int, std::pair<NSColor*, bool> > NSColorMap;
   mutable NSColorMap nscolor_cache_;
 #endif
 
   ResourceBundle& rb_;
   Profile* profile_;
 
   scoped_refptr<BrowserThemePack> theme_pack_;
 
   // The number of infobars currently displayed.
   int number_of_infobars_;
 
   DISALLOW_COPY_AND_ASSIGN(BrowserThemeProvider);
 };
 
 #endif  // CHROME_BROWSER_BROWSER_THEME_PROVIDER_H_