Revert "Revert "Add button tinting to the toolbar buttons.""

chrome/browser/gtk/custom_button.h

Index: chrome/browser/gtk/custom_button.h
diff --git a/chrome/browser/gtk/custom_button.h b/chrome/browser/gtk/custom_button.h
index 143a090d2ced55e98722047de8853626e882585a..2c6bc68ea95be933912ca1c34354cac52a9b662c 100644
--- a/chrome/browser/gtk/custom_button.h
+++ b/chrome/browser/gtk/custom_button.h
@@ -11,20 +11,28 @@
 
 #include "base/gfx/rect.h"
 #include "base/scoped_ptr.h"
+#include "chrome/common/notification_observer.h"
+#include "chrome/common/notification_registrar.h"
 #include "chrome/common/owned_widget_gtk.h"
 
+class ThemeProvider;
+
 // These classes implement two kinds of custom-drawn buttons.  They're
 // used on the toolbar and the bookmarks bar.
 
 // CustomDrawButtonBase provides the base for building a custom drawn button.
 // It handles managing the pixbufs containing all the static images used to draw
 // the button.  It also manages painting these pixbufs.
-class CustomDrawButtonBase {
+class CustomDrawButtonBase : public NotificationObserver {
  public:
-  CustomDrawButtonBase(int normal_id,
+  // If the images come from ResourceBundle rather than the theme provider,
+  // pass in NULL for |theme_provider|.
+  CustomDrawButtonBase(ThemeProvider* theme_provider,
+                       int normal_id,
                        int active_id,
                        int highlight_id,
                        int depressed_id);
+
   ~CustomDrawButtonBase();
 
   GdkPixbuf* pixbufs(int i) const { return pixbufs_[i]; }
@@ -33,6 +41,11 @@ class CustomDrawButtonBase {
 
   void set_paint_override(int state) { paint_override_ = state; }
 
+  // Provide NotificationObserver implementation.
+  virtual void Observe(NotificationType type,
+                       const NotificationSource& source,
+                       const NotificationDetails& details);
+
  private:
   // We store one GdkPixbuf* for each possible state of the button;
   // INSENSITIVE is the last available state;
@@ -41,6 +54,17 @@ class CustomDrawButtonBase {
   // If non-negative, the state to paint the button.
   int paint_override_;
 
+  // We need to remember the image ids that the user passes in and the theme
+  // provider so we can reload images if the user changes theme.
+  int normal_id_;
+  int active_id_;
+  int highlight_id_;
+  int depressed_id_;
+  ThemeProvider* theme_provider_;
+
+  // Used to listen for theme change notifications.
+  NotificationRegistrar registrar_;
+
   DISALLOW_COPY_AND_ASSIGN(CustomDrawButtonBase);
 };
 
@@ -56,9 +80,19 @@ class CustomDrawButton {
                    int highlight_id,
                    int depressed_id,
                    const char* stock_id);
-  explicit CustomDrawButton(const std::string& filename);
+
+  // Same as above, but uses themed (and possibly tinted) images.
+  CustomDrawButton(ThemeProvider* theme_provider,
+                   int normal_id,
+                   int active_id,
+                   int highlight_id,
+                   int depressed_id,
+                   const char* stock_id);
+
   ~CustomDrawButton();
 
+  void Init();
+
   GtkWidget* widget() const { return widget_.get(); }
 
   gfx::Rect bounds() const {