GTK: First draft of using native themes, partially based on evan's CL 118358.

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>
 
 #include "app/resource_bundle.h"
 #include "app/theme_provider.h"
 #include "base/basictypes.h"
 #include "base/non_thread_safe.h"
 #include "base/ref_counted.h"
 #include "skia/ext/skia_utils.h"
 
 class Extension;
 class Profile;
 class DictionaryValue;
 
+namespace themes {

[tony, 2009/07/07 19:47:05]

:( The style guide says the namespaces name should be chrome_browser. 
Alternately you could just make these class statics in BrowserThemeProvider
which might get rid of the need to prefix them in GtkThemeProvider.

+
+// Strings used by themes to identify colors for different parts of our UI.
+extern const char* kColorFrame;
+extern const char* kColorFrameInactive;
+extern const char* kColorFrameIncognito;
+extern const char* kColorFrameIncognitoInactive;
+extern const char* kColorToolbar;
+extern const char* kColorTabText;
+extern const char* kColorBackgroundTabText;
+extern const char* kColorBookmarkText;
+extern const char* kColorNTPBackground;
+extern const char* kColorNTPText;
+extern const char* kColorNTPLink;
+extern const char* kColorNTPSection;
+extern const char* kColorNTPSectionText;
+extern const char* kColorNTPSectionLink;
+extern const char* kColorControlBackground;
+extern const char* kColorButtonBackground;
+
+// Strings used by themes to identify tints to apply to different parts of
+// our UI. The frame tints apply to the frame color and produce the
+// COLOR_FRAME* colors.
+extern const char* kTintButtons;
+extern const char* kTintFrame;
+extern const char* kTintFrameInactive;
+extern const char* kTintFrameIncognito;
+extern const char* kTintFrameIncognitoInactive;
+extern const char* kTintBackgroundTab;
+
+// Strings used by themes to identify miscellaneous numerical properties.
+extern const char* kDisplayPropertyNTPAlignment;
+
+// Strings used in alignment properties.
+extern const char* kAlignmentTop;
+extern const char* kAlignmentBottom;
+extern const char* kAlignmentLeft;
+extern const char* kAlignmentRight;
+
+// Default colors.
+extern const SkColor kDefaultColorFrame;
+extern const SkColor kDefaultColorFrameInactive;
+extern const SkColor kDefaultColorFrameIncognito;
+extern const SkColor kDefaultColorFrameIncognitoInactive;
+extern const SkColor kDefaultColorToolbar;
+extern const SkColor kDefaultColorTabText;
+extern const SkColor kDefaultColorBackgroundTabText;
+extern const SkColor kDefaultColorBookmarkText;
+extern const SkColor kDefaultColorNTPBackground;
+extern const SkColor kDefaultColorNTPText;
+extern const SkColor kDefaultColorNTPLink;
+extern const SkColor kDefaultColorNTPSection;
+extern const SkColor kDefaultColorNTPSectionText;
+extern const SkColor kDefaultColorNTPSectionLink;
+extern const SkColor kDefaultColorControlBackground;
+extern const SkColor kDefaultColorButtonBackground;
+
+extern const skia::HSL kDefaultTintButtons;
+extern const skia::HSL kDefaultTintFrame;
+extern const skia::HSL kDefaultTintFrameInactive;
+extern const skia::HSL kDefaultTintFrameIncognito;
+extern const skia::HSL kDefaultTintFrameIncognitoInactive;
+extern const skia::HSL kDefaultTintBackgroundTab;
+}  // namespace themes
+
 class BrowserThemeProvider : public base::RefCounted<BrowserThemeProvider>,
                              public NonThreadSafe,
                              public ThemeProvider {
  public:
   BrowserThemeProvider();
   virtual ~BrowserThemeProvider();
 
   enum {
     COLOR_FRAME,
     COLOR_FRAME_INACTIVE,
@@ skipping 38 matching lines @@
   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);
+  virtual void SetTheme(Extension* extension);
 
   // Reset the theme to default.
-  void UseDefaultTheme();
+  virtual void UseDefaultTheme();
+
+  // Set the current theme to the native theme. On some platforms, the native
+  // theme is the default theme.
+  virtual void SetNativeTheme() { 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.
   static std::string AlignmentToString(int alignment);
 
   // Parse alignments from something like "top left" into a bitfield of
   // AlignmentMasks
   static int StringToAlignment(const std::string &alignment);
 
+ protected:
+  // Sets an individual color value.
+  void SetColor(const char* id, const SkColor& color);
+
+  // Sets an individual tint value.
+  void SetTint(const char* id, const skia::HSL& tint);
+
+  // Generate any frame colors that weren't specified.
+  void GenerateFrameColors();
+
+  // Generate any frame images that weren't specified. The resulting images
+  // will be stored in our cache.
+  void GenerateFrameImages();
+
+  // Clears all the override fields and saves the dictionary.
+  void ClearAllThemeData();
+
+  // Load theme data from preferences.
+  virtual void LoadThemePrefs();
+
+  // Let all the browser views know that themes have changed.
+  void NotifyThemeChanged();
+
+  // Loads a bitmap from the theme, which may be tinted or
+  // otherwise modified, or an application default.
+  virtual SkBitmap* LoadThemeBitmap(int id);
+
+  Profile* profile() { return profile_; }
+
  private:
   typedef std::map<const int, std::string> ImageMap;
   typedef std::map<const std::string, SkColor> ColorMap;
   typedef std::map<const std::string, skia::HSL> TintMap;
   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|
@@ skipping 14 matching lines @@
 
   // Set tint data for our images and colors. The keys of |tints| are
   // any of the kTint* contstants, and the values are a three-item list
   // containing real numbers in the range 0-1 (and -1 for 'null').
   void SetTintData(DictionaryValue* tints);
 
   // Set miscellaneous display properties. While these can be defined as
   // strings, they are currently stored as integers.
   void SetDisplayPropertyData(DictionaryValue* display_properties);
 
-  // Generate any frame colors that weren't specified.
-  void GenerateFrameColors();
-
-  // Generate any frame images that weren't specified. The resulting images
-  // will be stored in our cache.
-  void GenerateFrameImages();
-
   // Create any images that aren't pregenerated (e.g. background tab images).
   SkBitmap* GenerateBitmap(int id);
 
   // Save our data - when saving images we need the original dictionary
   // from the extension because it contains the text ids that we want to save.
   void SaveImageData(DictionaryValue* images);
   void SaveColorData();
   void SaveTintData();
   void SaveDisplayPropertyData();
 
-  // 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 ClearCaches();
 
   // 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
@@ skipping 16 matching lines @@
 
   ImageMap images_;
   ColorMap colors_;
   TintMap tints_;
   DisplayPropertyMap display_properties_;
 
   DISALLOW_COPY_AND_ASSIGN(BrowserThemeProvider);
 };
 
 #endif  // CHROME_BROWSER_BROWSER_THEME_PROVIDER_H_