Add VectorIconButton functionality to ImageButton.

ui/message_center/views/notifier_settings_view.h

Index: ui/message_center/views/notifier_settings_view.h
diff --git a/ui/message_center/views/notifier_settings_view.h b/ui/message_center/views/notifier_settings_view.h
index 1e23d5a08682798592970a31efe2c5cf014292e4..10abd1415669d3c21469180c58b4ad88d3884f90 100644
--- a/ui/message_center/views/notifier_settings_view.h
+++ b/ui/message_center/views/notifier_settings_view.h
@@ -35,7 +35,7 @@ namespace message_center {
 class MESSAGE_CENTER_EXPORT NotifierSettingsView
     : public NotifierSettingsObserver,
       public views::View,
-      public views::ButtonListener,
+      public views::ImageButtonDelegate,
       public views::ComboboxListener {
  public:
   explicit NotifierSettingsView(NotifierSettingsProvider* provider);
@@ -43,7 +43,7 @@ class MESSAGE_CENTER_EXPORT NotifierSettingsView
 
   bool IsScrollable();
 
-  // Overridden from NotifierSettingsDelegate:
+  // NotifierSettingsDelegate:
   void UpdateIconImage(const NotifierId& notifier_id,
                        const gfx::Image& icon) override;
   void NotifierGroupChanged() override;
@@ -57,12 +57,13 @@ class MESSAGE_CENTER_EXPORT NotifierSettingsView
  private:
   FRIEND_TEST_ALL_PREFIXES(NotifierSettingsViewTest, TestLearnMoreButton);
 
-  class MESSAGE_CENTER_EXPORT NotifierButton : public views::CustomButton,
-                         public views::ButtonListener {
+  class MESSAGE_CENTER_EXPORT NotifierButton
+      : public views::CustomButton,
+        public views::ImageButtonDelegate {
    public:
     NotifierButton(NotifierSettingsProvider* provider,
                    std::unique_ptr<Notifier> notifier,
-                   views::ButtonListener* listener);
+                   views::ImageButtonDelegate* listener);
     ~NotifierButton() override;
 
     void UpdateIconImage(const gfx::Image& icon);
@@ -74,7 +75,7 @@ class MESSAGE_CENTER_EXPORT NotifierSettingsView
     void SendLearnMorePressedForTest();
 
    private:
-    // Overridden from views::ButtonListener:
+    // views::ImageButtonDelegate:
     void ButtonPressed(views::Button* button, const ui::Event& event) override;
     void GetAccessibleNodeData(ui::AXNodeData* node_data) override;
 
@@ -98,17 +99,17 @@ class MESSAGE_CENTER_EXPORT NotifierSettingsView
   // Given a new list of notifiers, updates the view to reflect it.
   void UpdateContentsView(std::vector<std::unique_ptr<Notifier>> notifiers);
 
-  // Overridden from views::View:
+  // views::View:
   void Layout() override;
   gfx::Size GetMinimumSize() const override;
   gfx::Size GetPreferredSize() const override;
   bool OnKeyPressed(const ui::KeyEvent& event) override;
   bool OnMouseWheel(const ui::MouseWheelEvent& event) override;
 
-  // Overridden from views::ButtonListener:
+  // views::ImageButtonDelegate:
   void ButtonPressed(views::Button* sender, const ui::Event& event) override;
 
-  // Overridden from views::ComboboxListener:
+  // views::ComboboxListener:
   void OnPerformAction(views::Combobox* combobox) override;
 
   // Callback for views::MenuModelAdapter.