Add VectorIconButton functionality to ImageButton.

ui/message_center/views/notifier_settings_view.h

 // Copyright (c) 2013 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 UI_MESSAGE_CENTER_VIEWS_NOTIFIER_SETTINGS_VIEW_H_
 #define UI_MESSAGE_CENTER_VIEWS_NOTIFIER_SETTINGS_VIEW_H_
 
 #include <memory>
 #include <set>
 
@@ skipping 17 matching lines @@
 class Label;
 }
 
 namespace message_center {
 
 // A class to show the list of notifier extensions / URL patterns and allow
 // users to customize the settings.
 class MESSAGE_CENTER_EXPORT NotifierSettingsView
     : public NotifierSettingsObserver,
       public views::View,
-      public views::ButtonListener,
+      public views::ImageButtonDelegate,
       public views::ComboboxListener {
  public:
   explicit NotifierSettingsView(NotifierSettingsProvider* provider);
   ~NotifierSettingsView() override;
 
   bool IsScrollable();
 
-  // Overridden from NotifierSettingsDelegate:
+  // NotifierSettingsDelegate:
   void UpdateIconImage(const NotifierId& notifier_id,
                        const gfx::Image& icon) override;
   void NotifierGroupChanged() override;
   void NotifierEnabledChanged(const NotifierId& notifier_id,
                               bool enabled) override;
 
   void set_provider(NotifierSettingsProvider* new_provider) {
     provider_ = new_provider;
   }
 
  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);
     void SetChecked(bool checked);
     bool checked() const;
     bool has_learn_more() const;
     const Notifier& notifier() const;
 
     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;
 
     bool ShouldHaveLearnMoreButton() const;
     // Helper function to reset the layout when the view has substantially
     // changed.
     void GridChanged(bool has_learn_more, bool has_icon_view);
 
     NotifierSettingsProvider* provider_;  // Weak.
     std::unique_ptr<Notifier> notifier_;
     // |icon_view_| is owned by us because sometimes we don't leave it
     // in the view hierarchy.
     std::unique_ptr<views::ImageView> icon_view_;
     views::Label* name_view_;
     views::Checkbox* checkbox_;
     views::ImageButton* learn_more_;
 
     DISALLOW_COPY_AND_ASSIGN(NotifierButton);
   };
 
   // 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.
   void OnMenuClosed();
 
   views::ImageButton* title_arrow_;
   views::Label* title_label_;
   views::Combobox* notifier_group_combobox_;
   views::ScrollView* scroller_;
   NotifierSettingsProvider* provider_;
   std::set<NotifierButton*> buttons_;
   std::unique_ptr<ui::ComboboxModel> notifier_group_model_;
 
   DISALLOW_COPY_AND_ASSIGN(NotifierSettingsView);
 };
 
 }  // namespace message_center
 
 #endif  // UI_MESSAGE_CENTER_VIEWS_NOTIFIER_SETTINGS_VIEW_H_