Add VectorIconButton functionality to ImageButton.

ui/views/window/custom_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_WINDOW_CUSTOM_FRAME_VIEW_H_
 #define UI_VIEWS_WINDOW_CUSTOM_FRAME_VIEW_H_
 
 #include <memory>
 
 #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;
 
 ///////////////////////////////////////////////////////////////////////////////
 //
 // CustomFrameView
 //
 //  A view that provides the non client frame for Windows. This means
 //  rendering the non-standard window caption, border, and controls.
 //
 ////////////////////////////////////////////////////////////////////////////////
 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;
   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;
   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:
   friend class CustomFrameViewTest;
 
   // Returns the thickness of the border that makes up the window frame edges.
   // This does not include any client edge.
   int FrameBorderThickness() const;
 
   // Returns the thickness of the entire nonclient left, right, and bottom
@@ skipping 87 matching lines @@
   // True if the frame containing this frameview is currently active. Updated in
   // ActivationChanged().
   bool active_ = false;
 
   DISALLOW_COPY_AND_ASSIGN(CustomFrameView);
 };
 
 }  // namespace views
 
 #endif  // UI_VIEWS_WINDOW_CUSTOM_FRAME_VIEW_H_