Revert of BubbleFrameView: add top padding even when close button is hidden

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 a3f4bf162692ea328fba73cb584177d7518de1ba..43bac842f05e438b5a8001e005c41d2ddc20ddbf 100644
--- a/ui/views/bubble/bubble_frame_view.cc
+++ b/ui/views/bubble/bubble_frame_view.cc
@@ -99,15 +99,15 @@
 BubbleFrameView::~BubbleFrameView() {}
 
 // static
-ImageButton* BubbleFrameView::CreateCloseButton(ButtonListener* listener) {
+LabelButton* BubbleFrameView::CreateCloseButton(ButtonListener* listener) {
   ui::ResourceBundle& rb = ui::ResourceBundle::GetSharedInstance();
-  ImageButton* close = new ImageButton(listener);
+  LabelButton* close = new LabelButton(listener, base::string16());
   close->SetImage(CustomButton::STATE_NORMAL,
-                  rb.GetImageNamed(IDR_CLOSE_DIALOG).ToImageSkia());
+                  *rb.GetImageNamed(IDR_CLOSE_DIALOG).ToImageSkia());
   close->SetImage(CustomButton::STATE_HOVERED,
-                  rb.GetImageNamed(IDR_CLOSE_DIALOG_H).ToImageSkia());
+                  *rb.GetImageNamed(IDR_CLOSE_DIALOG_H).ToImageSkia());
   close->SetImage(CustomButton::STATE_PRESSED,
-                  rb.GetImageNamed(IDR_CLOSE_DIALOG_P).ToImageSkia());
+                  *rb.GetImageNamed(IDR_CLOSE_DIALOG_P).ToImageSkia());
   close->SetBorder(nullptr);
   close->SetSize(close->GetPreferredSize());
 #if !defined(OS_WIN)
@@ -245,9 +245,7 @@
   const int title_padding = has_title ? title_margins_.height() : 0;
   const int title_height = std::max(icon_height, label_height) + title_padding;
   const int close_height = close_->visible() ? close_->height() : 0;
-  const int min_height = !has_title ? close_->height() : 0;
-  insets +=
-      gfx::Insets(std::max({title_height, close_height, min_height}), 0, 0, 0);
+  insets += gfx::Insets(std::max(title_height, close_height), 0, 0, 0);
   return insets;
 }