Add VectorIconButton functionality to ImageButton.

ui/views/window/custom_frame_view.cc

Index: ui/views/window/custom_frame_view.cc
diff --git a/ui/views/window/custom_frame_view.cc b/ui/views/window/custom_frame_view.cc
index 14d4630a1a49d4e93d3086f29dbcada03cb2e193..30e1b01eede80a4baab00b934efabe83f575ec27 100644
--- a/ui/views/window/custom_frame_view.cc
+++ b/ui/views/window/custom_frame_view.cc
@@ -19,7 +19,6 @@
 #include "ui/gfx/path.h"
 #include "ui/resources/grit/ui_resources.h"
 #include "ui/strings/grit/ui_strings.h"
-#include "ui/views/controls/button/image_button.h"
 #include "ui/views/resources/grit/views_resources.h"
 #include "ui/views/views_delegate.h"
 #include "ui/views/widget/native_widget_private.h"
@@ -267,7 +266,7 @@ gfx::Size CustomFrameView::GetMaximumSize() const {
 }
 
 ///////////////////////////////////////////////////////////////////////////////
-// CustomFrameView, ButtonListener implementation:
+// CustomFrameView, ImageButtonDelegate implementation:
 
 void CustomFrameView::ButtonPressed(Button* sender, const ui::Event& event) {
   if (sender == close_button_)