Add VectorIconButton functionality to ImageButton.

chrome/browser/ui/views/find_bar_view.h

Index: chrome/browser/ui/views/find_bar_view.h
diff --git a/chrome/browser/ui/views/find_bar_view.h b/chrome/browser/ui/views/find_bar_view.h
index 212f47416903c2fa9900e457e0c673fd03edf1b9..d17d782bc02ffa4d4c0977c42d5a43ea0ea3fc65 100644
--- a/chrome/browser/ui/views/find_bar_view.h
+++ b/chrome/browser/ui/views/find_bar_view.h
@@ -11,7 +11,8 @@
 #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"
@@ -28,7 +29,7 @@ class Label;
 class Painter;
 class Separator;
 class Textfield;
-class VectorIconButton;
+class ImageButton;
 }
 
 ////////////////////////////////////////////////////////////////////////////////
@@ -40,7 +41,7 @@ class VectorIconButton;
 ////////////////////////////////////////////////////////////////////////////////
 class FindBarView : public views::View,
                     public DropdownBarHostDelegate,
-                    public views::VectorIconButtonDelegate,
+                    public views::ButtonListener,
                     public views::TextfieldController,
                     public views::ViewTargeterDelegate {
  public:
@@ -74,9 +75,8 @@ class FindBarView : public views::View,
   // 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,
@@ -88,6 +88,21 @@ class FindBarView : public views::View,
   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);
 
@@ -115,9 +130,10 @@ class FindBarView : public views::View,
   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_;