Add VectorIconButton functionality to ImageButton.

ui/views/bubble/bubble_frame_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_VIEWS_BUBBLE_BUBBLE_FRAME_VIEW_H_
 #define UI_VIEWS_BUBBLE_BUBBLE_FRAME_VIEW_H_
 
 #include "base/compiler_specific.h"
 #include "base/gtest_prod_util.h"
 #include "base/macros.h"
 #include "ui/gfx/geometry/insets.h"
-#include "ui/views/controls/button/vector_icon_button_delegate.h"
+#include "ui/views/controls/button/button.h"
 #include "ui/views/window/non_client_view.h"
 
 namespace gfx {
 class FontList;
 }
 
 namespace views {
 
 class Label;
-class Button;
 class BubbleBorder;
 class ImageView;
 
 // The non-client frame view of bubble-styled widgets.
 class VIEWS_EXPORT BubbleFrameView : public NonClientFrameView,
-                                     public VectorIconButtonDelegate {
+                                     public ButtonListener {
  public:
   // Internal class name.
   static const char kViewClassName[];
 
   BubbleFrameView(const gfx::Insets& title_margins,
                   const gfx::Insets& content_margins);
   ~BubbleFrameView() override;
 
   // Creates a close button used in the corner of the dialog.
-  static Button* CreateCloseButton(VectorIconButtonDelegate* delegate);
+  static Button* CreateCloseButton(ButtonListener* listener);
 
-  // NonClientFrameView overrides:
+  // NonClientFrameView:
   gfx::Rect GetBoundsForClientView() const override;
   gfx::Rect GetWindowBoundsForClientBounds(
       const gfx::Rect& client_bounds) const override;
   bool GetClientMask(const gfx::Size& size, gfx::Path* path) const override;
   int NonClientHitTest(const gfx::Point& point) override;
   void GetWindowMask(const gfx::Size& size, gfx::Path* window_mask) override;
   void ResetWindowControls() override;
   void UpdateWindowIcon() override;
   void UpdateWindowTitle() override;
   void SizeConstraintsChanged() override;
 
   // Set the FontList to be used for the title of the bubble.
   // Caller must arrange to update the layout to have the call take effect.
   void SetTitleFontList(const gfx::FontList& font_list);
 
-  // View overrides:
+  // View:
   const char* GetClassName() const override;
   gfx::Insets GetInsets() const override;
   gfx::Size GetPreferredSize() const override;
   gfx::Size GetMinimumSize() const override;
   gfx::Size GetMaximumSize() const override;
   void Layout() override;
   void OnPaint(gfx::Canvas* canvas) override;
   void PaintChildren(const ui::PaintContext& context) override;
   void OnThemeChanged() override;
   void OnNativeThemeChanged(const ui::NativeTheme* theme) override;
 
-  // Overridden from VectorIconButtonDelegate:
+  // ButtonListener:
   void ButtonPressed(Button* sender, const ui::Event& event) override;
 
   // Use bubble_border() and SetBubbleBorder(), not border() and SetBorder().
   BubbleBorder* bubble_border() const { return bubble_border_; }
   void SetBubbleBorder(std::unique_ptr<BubbleBorder> border);
 
   gfx::Insets content_margins() const { return content_margins_; }
 
   void SetFootnoteView(View* view);
 
@@ skipping 53 matching lines @@
 
   // Whether the close button was clicked.
   bool close_button_clicked_;
 
   DISALLOW_COPY_AND_ASSIGN(BubbleFrameView);
 };
 
 }  // namespace views
 
 #endif  // UI_VIEWS_BUBBLE_BUBBLE_FRAME_VIEW_H_