Add VectorIconButton functionality to ImageButton.

chrome/browser/ui/views/toolbar/app_menu.cc

Index: chrome/browser/ui/views/toolbar/app_menu.cc
diff --git a/chrome/browser/ui/views/toolbar/app_menu.cc b/chrome/browser/ui/views/toolbar/app_menu.cc
index c55221dff45d1be80965489fa9e874625ef6bb93..56574cf9e3562eff59b01e9f66cb3491dc798096 100644
--- a/chrome/browser/ui/views/toolbar/app_menu.cc
+++ b/chrome/browser/ui/views/toolbar/app_menu.cc
@@ -111,10 +111,10 @@ bool IsRecentTabsCommand(int command_id) {
 // Subclass of ImageButton whose preferred size includes the size of the border.
 class FullscreenButton : public ImageButton {
  public:
-  explicit FullscreenButton(views::ButtonListener* listener)
-      : ImageButton(listener) { }
+  explicit FullscreenButton(views::ImageButtonDelegate* listener)
+      : ImageButton(listener) {}
 
-  // Overridden from ImageButton.
+  // views::ImageButton:
   gfx::Size GetPreferredSize() const override {
     gfx::Size pref = ImageButton::GetPreferredSize();
     if (border()) {
@@ -151,7 +151,7 @@ class InMenuButtonBackground : public views::Background {
 
   explicit InMenuButtonBackground(ButtonType type) : type_(type) {}
 
-  // Overridden from views::Background.
+  // views::Background:
   void Paint(gfx::Canvas* canvas, View* view) const override {
     CustomButton* button = CustomButton::AsCustomButton(view);
     views::Button::ButtonState state =
@@ -251,7 +251,7 @@ base::string16 GetAccessibleNameForAppMenuItem(ButtonMenuItemModel* model,
 // A button that lives inside a menu item.
 class InMenuButton : public LabelButton {
  public:
-  InMenuButton(views::ButtonListener* listener, const base::string16& text)
+  InMenuButton(views::ImageButtonDelegate* listener, const base::string16& text)
       : LabelButton(listener, text), in_menu_background_(NULL) {}
   ~InMenuButton() override {}
 
@@ -303,7 +303,7 @@ class InMenuButton : public LabelButton {
 
 // AppMenuView is a view that can contain label buttons.
 class AppMenuView : public views::View,
-                    public views::ButtonListener,
+                    public views::ImageButtonDelegate,
                     public AppMenuObserver {
  public:
   AppMenuView(AppMenu* menu, ButtonMenuItemModel* menu_model)
@@ -317,7 +317,7 @@ class AppMenuView : public views::View,
       menu_->RemoveObserver(this);
   }
 
-  // Overridden from views::View.
+  // views::View:
   void SchedulePaintInRect(const gfx::Rect& r) override {
     // Normally when the mouse enters/exits a button the buttons invokes
     // SchedulePaint. As part of the button border (InMenuButtonBackground) is
@@ -356,7 +356,7 @@ class AppMenuView : public views::View,
     return button;
   }
 
-  // Overridden from AppMenuObserver:
+  // AppMenuObserver:
   void AppMenuDestroyed() override {
     menu_->RemoveObserver(this);
     menu_ = NULL;
@@ -436,7 +436,7 @@ class AppMenu::CutCopyPasteView : public AppMenuView {
                              paste_index);
   }
 
-  // Overridden from View.
+  // views::View:
   gfx::Size GetPreferredSize() const override {
     // Returned height doesn't matter as MenuItemView forces everything to the
     // height of the menuitemview.
@@ -450,7 +450,7 @@ class AppMenu::CutCopyPasteView : public AppMenuView {
       child_at(i)->SetBounds(i * width, 0, width, height());
   }
 
-  // Overridden from ButtonListener.
+  // views::ImageButtonDelegate:
   void ButtonPressed(views::Button* sender, const ui::Event& event) override {
     menu()->CancelAndEvaluate(menu_model(), sender->tag());
   }
@@ -541,7 +541,7 @@ class AppMenu::ZoomView : public AppMenuView {
 
   ~ZoomView() override {}
 
-  // Overridden from View.
+  // views::View:
   gfx::Size GetPreferredSize() const override {
     // The increment/decrement button are forced to the same width.
     int button_width = std::max(increment_button_->GetPreferredSize().width(),
@@ -607,7 +607,7 @@ class AppMenu::ZoomView : public AppMenuView {
     }
   }
 
-  // Overridden from ButtonListener.
+  // views::ImageButtonDelegate:
   void ButtonPressed(views::Button* sender, const ui::Event& event) override {
     if (sender->tag() == fullscreen_index_) {
       menu()->CancelAndEvaluate(menu_model(), sender->tag());