Add VectorIconButton functionality to ImageButton.

ui/views/window/custom_frame_view.h

Index: ui/views/window/custom_frame_view.h
diff --git a/ui/views/window/custom_frame_view.h b/ui/views/window/custom_frame_view.h
index 76d4fc26bc6d5445d90d763d6cff203694afb3ae..a00756fe6881dac8639e0bbb632c021f50d93378 100644
--- a/ui/views/window/custom_frame_view.h
+++ b/ui/views/window/custom_frame_view.h
@@ -10,14 +10,13 @@
 #include "base/compiler_specific.h"
 #include "base/macros.h"
 #include "ui/gfx/image/image_skia.h"
-#include "ui/views/controls/button/button.h"
+#include "ui/views/controls/button/image_button.h"
 #include "ui/views/window/frame_buttons.h"
 #include "ui/views/window/non_client_view.h"
 
 namespace views {
 
 class FrameBackground;
-class ImageButton;
 class Widget;
 
 ///////////////////////////////////////////////////////////////////////////////
@@ -29,14 +28,14 @@ class Widget;
 //
 ////////////////////////////////////////////////////////////////////////////////
 class VIEWS_EXPORT CustomFrameView : public NonClientFrameView,
-                                     public ButtonListener {
+                                     public ImageButtonDelegate {
  public:
   CustomFrameView();
   ~CustomFrameView() override;
 
   void Init(Widget* frame);
 
-  // Overridden from NonClientFrameView:
+  // NonClientFrameView:
   gfx::Rect GetBoundsForClientView() const override;
   gfx::Rect GetWindowBoundsForClientBounds(
       const gfx::Rect& client_bounds) const override;
@@ -48,14 +47,14 @@ class VIEWS_EXPORT CustomFrameView : public NonClientFrameView,
   void SizeConstraintsChanged() override;
   void ActivationChanged(bool active) override;
 
-  // Overridden from View:
+  // View:
   void OnPaint(gfx::Canvas* canvas) override;
   void Layout() override;
   gfx::Size GetPreferredSize() const override;
   gfx::Size GetMinimumSize() const override;
   gfx::Size GetMaximumSize() const override;
 
-  // Overridden from ButtonListener:
+  // ImageButtonDelegate:
   void ButtonPressed(Button* sender, const ui::Event& event) override;
 
  private: