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

ui/views/bubble/bubble_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/bubble/bubble_frame_view.h"
 
 #include <algorithm>
 #include <utility>
 
 #include "build/build_config.h"
@@ skipping 81 matching lines @@
   AddChildView(title_);
 
   close_ = CreateCloseButton(this);
   close_->SetVisible(false);
   AddChildView(close_);
 }
 
 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)
   // Windows will automatically create a tooltip for the close button based on
   // the HTCLOSE result from NonClientHitTest().
   close->SetTooltipText(l10n_util::GetStringUTF16(IDS_APP_CLOSE));
 #endif
   return close;
 }
 
@@ skipping 117 matching lines @@
 
 gfx::Insets BubbleFrameView::GetInsets() const {
   gfx::Insets insets = content_margins_;
 
   const int icon_height = title_icon_->GetPreferredSize().height();
   const int label_height = title_->GetPreferredSize().height();
   const bool has_title = icon_height > 0 || label_height > 0;
   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;
 }
 
 gfx::Size BubbleFrameView::GetPreferredSize() const {
   // Get the preferred size of the client area.
   gfx::Size client_size = GetWidget()->client_view()->GetPreferredSize();
   // Expand it to include the bubble border and space for the arrow.
   return GetWindowBoundsForClientBounds(gfx::Rect(client_size)).size();
 }
 
@@ skipping 253 matching lines @@
   size.Enlarge(client_insets.width(), client_insets.height());
   size.SetToMax(gfx::Size(title_bar_width, 0));
 
   if (footnote_container_)
     size.Enlarge(0, footnote_container_->GetHeightForWidth(size.width()));
 
   return size;
 }
 
 }  // namespace views