Add VectorIconButton functionality to ImageButton.

ui/views/bubble/bubble_frame_view.cc

Index: ui/views/bubble/bubble_frame_view.cc
diff --git a/ui/views/bubble/bubble_frame_view.cc b/ui/views/bubble/bubble_frame_view.cc
index 14f5622aba174aeff0115960fd7b8cb22cf925a6..f75d4ba01354320eb148046b66faf003436e1a09 100644
--- a/ui/views/bubble/bubble_frame_view.cc
+++ b/ui/views/bubble/bubble_frame_view.cc
@@ -25,7 +25,6 @@
 #include "ui/strings/grit/ui_strings.h"
 #include "ui/vector_icons/vector_icons.h"
 #include "ui/views/bubble/bubble_border.h"
-#include "ui/views/controls/button/vector_icon_button.h"
 #include "ui/views/controls/image_view.h"
 #include "ui/views/controls/label.h"
 #include "ui/views/layout/box_layout.h"
@@ -108,12 +107,11 @@ BubbleFrameView::BubbleFrameView(const gfx::Insets& title_margins,
 BubbleFrameView::~BubbleFrameView() {}
 
 // static
-Button* BubbleFrameView::CreateCloseButton(VectorIconButtonDelegate* delegate) {
+Button* BubbleFrameView::CreateCloseButton(ImageButtonDelegate* delegate) {
   ImageButton* close_button = nullptr;
   if (ui::MaterialDesignController::IsSecondaryUiMaterial()) {
-    VectorIconButton* close = new VectorIconButton(delegate);
-    close->SetIcon(ui::kCloseIcon);
-    close_button = close;
+    close_button =
+        ImageButton::CreateDefaultVectorIconButton(ui::kCloseIcon, delegate);
   } else {
     ui::ResourceBundle* rb = &ui::ResourceBundle::GetSharedInstance();
     close_button = new ImageButton(delegate);