Re-land 4ced9f3c7e9534b6b730d: Fix layout of BubbleFrameView when there's only a close button in th…

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 241 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 =
       GetWidget()->widget_delegate()->ShouldShowCloseButton()
-          ? close_->height()
+          ? close_->height() + LayoutProvider::Get()->GetDistanceMetric(
+                                   DISTANCE_CLOSE_BUTTON_MARGIN)
           : 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 257 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