Add VectorIconButton functionality to ImageButton.

ui/app_list/views/search_box_view.h

 // Copyright (c) 2012 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_APP_LIST_VIEWS_SEARCH_BOX_VIEW_H_
 #define UI_APP_LIST_VIEWS_SEARCH_BOX_VIEW_H_
 
 #include <string>
 
 #include "base/macros.h"
@@ skipping 24 matching lines @@
 class SearchBoxModel;
 class SearchBoxViewDelegate;
 class SearchBoxImageButton;
 
 // SearchBoxView consists of an icon and a Textfield. SearchBoxModel is its data
 // model that controls what icon to display, what placeholder text to use for
 // Textfield. The text and selection model part could be set to change the
 // contents and selection model of the Textfield.
 class APP_LIST_EXPORT SearchBoxView : public views::View,
                                       public views::TextfieldController,
-                                      public views::ButtonListener,
+                                      public views::ImageButtonDelegate,
                                       public SearchBoxModelObserver,
                                       public SpeechUIModelObserver {
  public:
   SearchBoxView(SearchBoxViewDelegate* delegate,
                 AppListViewDelegate* view_delegate);
   ~SearchBoxView() override;
 
   void ModelChanged();
   bool HasSearch() const;
   void ClearSearch();
@@ skipping 15 matching lines @@
 
   // Moves focus forward/backwards in response to TAB.
   bool MoveTabFocus(bool move_backwards);
 
   // Moves focus to contents or SearchBox and unselects buttons.
   void ResetTabFocus(bool on_contents);
 
   // Sets voice label for Back button depending on whether a folder is open.
   void SetBackButtonLabel(bool folder);
 
-  // Overridden from views::View:
+  // views::View:
   gfx::Size GetPreferredSize() const override;
   bool OnMouseWheel(const ui::MouseWheelEvent& event) override;
   void OnEnabledChanged() override;
 
  private:
   // Updates model text and selection model with current Textfield info.
   void UpdateModel();
 
   // Fires query change notification.
   void NotifyQueryChanged();
 
-  // Overridden from views::TextfieldController:
+  // views::TextfieldController:
   void ContentsChanged(views::Textfield* sender,
                        const base::string16& new_contents) override;
   bool HandleKeyEvent(views::Textfield* sender,
                       const ui::KeyEvent& key_event) override;
 
-  // Overridden from views::ButtonListener:
+  // views::ImageButtonDelegate:
   void ButtonPressed(views::Button* sender, const ui::Event& event) override;
 
-  // Overridden from SearchBoxModelObserver:
+  // SearchBoxModelObserver:
   void SpeechRecognitionButtonPropChanged() override;
   void HintTextChanged() override;
   void SelectionModelChanged() override;
   void TextChanged() override;
 
-  // Overridden from SpeechUIModelObserver:
+  // SpeechUIModelObserver:
   void OnSpeechRecognitionStateChanged(
       SpeechRecognitionState new_state) override;
 
   SearchBoxViewDelegate* delegate_;  // Not owned.
   AppListViewDelegate* view_delegate_;  // Not owned.
   AppListModel* model_;  // Owned by the profile-keyed service.
 
   views::View* content_container_;     // Owned by views hierarchy.
   SearchBoxImageButton* back_button_;    // Owned by views hierarchy.
   SearchBoxImageButton* speech_button_;  // Owned by views hierarchy.
   views::Textfield* search_box_;  // Owned by views hierarchy.
   views::View* contents_view_;  // Owned by views hierarchy.
 
   SearchBoxFocus focused_view_;  // Which element has TAB'd focus.
 
   DISALLOW_COPY_AND_ASSIGN(SearchBoxView);
 };
 
 }  // namespace app_list
 
 #endif  // UI_APP_LIST_VIEWS_SEARCH_BOX_VIEW_H_