Add VectorIconButton functionality to ImageButton.

ui/views/window/custom_frame_view.cc

 // 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.
 
 #include "ui/views/window/custom_frame_view.h"
 
 #include <algorithm>
 #include <vector>
 
 #include "base/strings/utf_string_conversions.h"
 #include "build/build_config.h"
 #include "ui/base/hit_test.h"
 #include "ui/base/l10n/l10n_util.h"
 #include "ui/base/resource/resource_bundle.h"
 #include "ui/gfx/canvas.h"
 #include "ui/gfx/font.h"
 #include "ui/gfx/geometry/rect.h"
 #include "ui/gfx/image/image.h"
 #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"
 #include "ui/views/widget/widget.h"
 #include "ui/views/widget/widget_delegate.h"
 #include "ui/views/window/client_view.h"
 #include "ui/views/window/frame_background.h"
 #include "ui/views/window/window_button_order_provider.h"
 #include "ui/views/window/window_resources.h"
 #include "ui/views/window/window_shape.h"
@@ skipping 227 matching lines @@
 gfx::Size CustomFrameView::GetMaximumSize() const {
   gfx::Size max_size = frame_->client_view()->GetMaximumSize();
   gfx::Size converted_size =
       frame_->non_client_view()->GetWindowBoundsForClientBounds(
           gfx::Rect(max_size)).size();
   return gfx::Size(max_size.width() == 0 ? 0 : converted_size.width(),
                    max_size.height() == 0 ? 0 : converted_size.height());
 }
 
 ///////////////////////////////////////////////////////////////////////////////
-// CustomFrameView, ButtonListener implementation:
+// CustomFrameView, ImageButtonDelegate implementation:
 
 void CustomFrameView::ButtonPressed(Button* sender, const ui::Event& event) {
   if (sender == close_button_)
     frame_->Close();
   else if (sender == minimize_button_)
     frame_->Minimize();
   else if (sender == maximize_button_)
     frame_->Maximize();
   else if (sender == restore_button_)
     frame_->Restore();
@@ skipping 357 matching lines @@
     }
     case views::FRAME_BUTTON_CLOSE: {
       button = close_button_;
       break;
     }
   }
   return button;
 }
 
 }  // namespace views