[Toolbar] Base toolbar button class with background images for button states

chrome/browser/ui/views/toolbar/reload_button.h

Index: chrome/browser/ui/views/toolbar/reload_button.h
diff --git a/chrome/browser/ui/views/toolbar/reload_button.h b/chrome/browser/ui/views/toolbar/reload_button.h
index 4d4208855c16161a7696bdaebd56bed593d9fa8e..e4ec56033bc17d06e8feef0699366efedde6e90c 100644
--- a/chrome/browser/ui/views/toolbar/reload_button.h
+++ b/chrome/browser/ui/views/toolbar/reload_button.h
@@ -8,7 +8,7 @@
 #include "base/basictypes.h"
 #include "base/gtest_prod_util.h"
 #include "base/timer/timer.h"
-#include "chrome/browser/ui/views/toolbar/button_dropdown.h"
+#include "chrome/browser/ui/views/toolbar/toolbar_button.h"
 #include "ui/base/models/simple_menu_model.h"
 
 class CommandUpdater;
@@ -25,8 +25,7 @@ class LocationBarView;
 //
 ////////////////////////////////////////////////////////////////////////////////
 
-class ReloadButton : public ButtonDropDown,
-                     public views::ButtonListener,
+class ReloadButton : public ToolbarButton,
                      public ui::SimpleMenuModel::Delegate {
  public:
   enum Mode { MODE_RELOAD = 0, MODE_STOP };
@@ -103,8 +102,10 @@ class ReloadButton : public ButtonDropDown,
   // Indicates if reload menu is enabled.
   bool menu_enabled_;
 
-  // The parent class's images_ member is used for the current images,
-  // and this array is used to hold the alternative images.
+  // The images used to render the different states of this button.
+  gfx::ImageSkia images_[STATE_COUNT];

[Peter Kasting, 2013/11/19 02:28:50]

These two arrays are dead and should be removed.

[Greg Billock, 2013/11/20 00:59:03]

Done.

+
+  // Array is used to hold the alternative images.
   // We swap between the two when changing mode.
   gfx::ImageSkia alternate_images_[STATE_COUNT];