Add VectorIconButton functionality to ImageButton.

chrome/browser/ui/views/find_bar_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 CHROME_BROWSER_UI_VIEWS_FIND_BAR_VIEW_H_
 #define CHROME_BROWSER_UI_VIEWS_FIND_BAR_VIEW_H_
 
 #include <memory>
 
 #include "base/compiler_specific.h"
 #include "base/macros.h"
 #include "base/strings/string16.h"
 #include "chrome/browser/ui/views/dropdown_bar_host_delegate.h"
-#include "ui/views/controls/button/vector_icon_button_delegate.h"
+#include "ui/views/controls/button/button.h"
+#include "ui/views/controls/button/vector_icon_image_button_observer.h"
 #include "ui/views/controls/textfield/textfield_controller.h"
 #include "ui/views/view.h"
 #include "ui/views/view_targeter_delegate.h"
 
 class FindBarHost;
 class FindNotificationDetails;
 
 namespace gfx {
 class Range;
 }
 
 namespace views {
 class Label;
 class Painter;
 class Separator;
 class Textfield;
-class VectorIconButton;
+class ImageButton;
 }
 
 ////////////////////////////////////////////////////////////////////////////////
 //
 // The FindBarView is responsible for drawing the UI controls of the
 // FindBar, the find text box, the 'Find' button and the 'Close'
 // button. It communicates the user search words to the FindBarHost.
 //
 ////////////////////////////////////////////////////////////////////////////////
 class FindBarView : public views::View,
                     public DropdownBarHostDelegate,
-                    public views::VectorIconButtonDelegate,
+                    public views::ButtonListener,
                     public views::TextfieldController,
                     public views::ViewTargeterDelegate {
  public:
   explicit FindBarView(FindBarHost* host);
   ~FindBarView() override;
 
   // Accessors for the text and selection displayed in the text box.
   void SetFindTextAndSelectedRange(const base::string16& find_text,
                                    const gfx::Range& selected_range);
   base::string16 GetFindText() const;
@@ skipping 13 matching lines @@
   // Clears the current Match Count value in the Find text box.
   void ClearMatchCount();
 
   // views::View:
   void Layout() override;
   gfx::Size GetPreferredSize() const override;
 
   // DropdownBarHostDelegate:
   void SetFocusAndSelection(bool select_all) override;
 
-  // views::VectorIconButtonDelegate:
+  // views::ButtonListener:
   void ButtonPressed(views::Button* sender, const ui::Event& event) override;
-  SkColor GetVectorIconBaseColor() const override;
 
   // views::TextfieldController:
   bool HandleKeyEvent(views::Textfield* sender,
                       const ui::KeyEvent& key_event) override;
   void OnAfterUserAction(views::Textfield* sender) override;
   void OnAfterPaste() override;
 
   // views::ViewTargeterDelegate:
   views::View* TargetForRect(View* root, const gfx::Rect& rect) override;
 
  private:
+  class FindBarViewButtonObserver
+      : public views::VectorIconImageButtonObserver {
+   public:
+    explicit FindBarViewButtonObserver(FindBarView* parent);
+
+   private:
+    // views::VectorIconImageButtonObserver:
+    const gfx::VectorIcon& GetVectorIcon(View* view) const override;
+    SkColor GetVectorIconColor() const override;
+
+    FindBarView* parent_;
+  };
+
+  views::ImageButton* CreateButton(const gfx::VectorIcon& icon);
+
   // Starts finding |search_text|.  If the text is empty, stops finding.
   void Find(const base::string16& search_text);
 
   // Updates the appearance for the match count label.
   void UpdateMatchCountAppearance(bool no_match);
 
   // DropdownBarView:
   const char* GetClassName() const override;
   void OnNativeThemeChanged(const ui::NativeTheme* theme) override;
 
   // Returns the color for the icons on the buttons per the current NativeTheme.
   SkColor GetTextColorForIcon();
 
   // The OS-specific view for the find bar that acts as an intermediary
   // between us and the WebContentsView.
   FindBarHost* find_bar_host_;
 
   // Used to detect if the input text, not including the IME composition text,
   // has changed or not.
   base::string16 last_searched_text_;
 
   // The controls in the window.
   views::Textfield* find_text_;
   std::unique_ptr<views::Painter> find_text_border_;
   views::Label* match_count_text_;
   views::View* focus_forwarder_view_;
   views::Separator* separator_;
-  views::VectorIconButton* find_previous_button_;
-  views::VectorIconButton* find_next_button_;
-  views::VectorIconButton* close_button_;
+  FindBarViewButtonObserver button_observer_;
+  views::ImageButton* find_previous_button_;
+  views::ImageButton* find_next_button_;
+  views::ImageButton* close_button_;
 
   // The preferred height of the find bar.
   int preferred_height_;
 
   DISALLOW_COPY_AND_ASSIGN(FindBarView);
 };
 
 #endif  // CHROME_BROWSER_UI_VIEWS_FIND_BAR_VIEW_H_