Add VectorIconButton functionality to ImageButton.

chrome/browser/ui/views/infobars/infobar_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_INFOBARS_INFOBAR_VIEW_H_
 #define CHROME_BROWSER_UI_VIEWS_INFOBARS_INFOBAR_VIEW_H_
 
 #include "base/compiler_specific.h"
 #include "base/macros.h"
 #include "components/infobars/core/infobar.h"
 #include "components/infobars/core/infobar_container.h"
 #include "third_party/skia/include/core/SkPath.h"
 #include "ui/views/controls/button/button.h"
-#include "ui/views/controls/button/vector_icon_button_delegate.h"
 #include "ui/views/controls/menu/menu_types.h"
 #include "ui/views/focus/external_focus_tracker.h"
 #include "ui/views/view_targeter_delegate.h"
 
 namespace views {
+class ImageButton;
 class ImageView;
 class Label;
 class Link;
 class LinkListener;
 class MenuRunner;
-class VectorIconButton;
 }  // namespace views
 
 class InfoBarView : public infobars::InfoBar,
                     public views::View,
-                    public views::VectorIconButtonDelegate,
+                    public views::ButtonListener,
                     public views::ExternalFocusTracker,
                     public views::ViewTargeterDelegate {
  public:
   explicit InfoBarView(std::unique_ptr<infobars::InfoBarDelegate> delegate);
 
   const infobars::InfoBarContainer::Delegate* container_delegate() const;
 
  protected:
   typedef std::vector<views::Label*> Labels;
 
@@ skipping 11 matching lines @@
   // each label's size so that the longest label shrinks until it reaches the
   // length of the next-longest label, then both shrink until reaching the
   // length of the next-longest, and so forth.
   static void AssignWidths(Labels* labels, int available_width);
 
   // views::View:
   void Layout() override;
   void ViewHierarchyChanged(
       const ViewHierarchyChangedDetails& details) override;
 
-  // views::VectorIconButtonDelegate:
+  // views::ButtonListener:
   // NOTE: This must not be called if we're unowned.  (Subclasses should ignore
   // calls to ButtonPressed() in this case.)
   void ButtonPressed(views::Button* sender, const ui::Event& event) override;
-  SkColor GetVectorIconBaseColor() const override;
 
   // Returns the minimum width the content (that is, everything between the icon
   // and the close button) can be shrunk to.  This is used to prevent the close
   // button from overlapping views that cannot be shrunk any further.
   virtual int ContentMinimumWidth() const;
 
   // These return x coordinates delimiting the usable area for subclasses to lay
   // out their controls.
   int StartX() const;
   int EndX() const;
@@ skipping 30 matching lines @@
                          const gfx::Rect& rect) const override;
 
   // This container holds the children and clips their painting during
   // animation.
   views::View* child_container_;
 
   // The optional icon at the left edge of the InfoBar.
   views::ImageView* icon_;
 
   // The close button at the right edge of the InfoBar.
-  views::VectorIconButton* close_button_;
+  views::ImageButton* close_button_;
 
   // Used to run the menu.
   std::unique_ptr<views::MenuRunner> menu_runner_;
 
   DISALLOW_COPY_AND_ASSIGN(InfoBarView);
 };
 
 #endif  // CHROME_BROWSER_UI_VIEWS_INFOBARS_INFOBAR_VIEW_H_