Revert "Add button tinting to the toolbar buttons."

chrome/browser/gtk/custom_button.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_GTK_CUSTOM_BUTTON_H_
 #define CHROME_BROWSER_GTK_CUSTOM_BUTTON_H_
 
 #include <gtk/gtk.h>
 
 #include <string>
 
 #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 : public NotificationObserver {
+class CustomDrawButtonBase {
  public:
-  // If the images come from ResourceBundle rather than the theme provider,
-  // pass in NULL for |theme_provider|.
-  CustomDrawButtonBase(ThemeProvider* theme_provider,
-                       int normal_id,
+  CustomDrawButtonBase(int normal_id,
                        int active_id,
                        int highlight_id,
                        int depressed_id);
-
   ~CustomDrawButtonBase();
 
   GdkPixbuf* pixbufs(int i) const { return pixbufs_[i]; }
 
   gboolean OnExpose(GtkWidget* widget, GdkEventExpose* e);
 
   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;
   GdkPixbuf* pixbufs_[GTK_STATE_INSENSITIVE + 1];
 
   // 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);
 };
 
 // CustomDrawButton is a plain button where all its various states are drawn
 // with static images. In GTK rendering mode, it will show the standard button
 // with GTK |stock_id|.
 class CustomDrawButton {
  public:
   // The constructor takes 4 resource ids.  If a resource doesn't exist for a
   // button, pass in 0.
   CustomDrawButton(int normal_id,
                    int active_id,
                    int highlight_id,
                    int depressed_id,
                    const char* stock_id);
-
-  // 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);
-
+  explicit CustomDrawButton(const std::string& filename);
   ~CustomDrawButton();
 
-  void Init();
-
   GtkWidget* widget() const { return widget_.get(); }
 
   gfx::Rect bounds() const {
       return gfx::Rect(widget_->allocation.x,
                        widget_->allocation.y,
                        widget_->allocation.width,
                        widget_->allocation.height);
   }
 
   int width() const { return widget_->allocation.width; }
@@ skipping 29 matching lines @@
   // The stock icon name.
   const char* gtk_stock_name_;
 
   // Whether we have an expose signal handler we may need to remove.
   bool has_expose_signal_handler_;
 
   DISALLOW_COPY_AND_ASSIGN(CustomDrawButton);
 };
 
 #endif  // CHROME_BROWSER_GTK_CUSTOM_BUTTON_H_