Fix layout of BubbleFrameView when there's only a close button in the

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 239 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() +
+                2 * ViewsDelegate::GetInstance()->GetDistanceMetric(
+                        DistanceMetric::CLOSE_BUTTON_MARGIN)

[Peter Kasting, 2017/04/11 20:12:58]

I'm wondering whether this is correct, or we only want to add 1x instead of 2x. 
The margin is technically only on the top, not the top and bottom.  If we only
add 1x, then in theory the content below can come up to the bottom of the (24 px
including padding) close button.  I think maybe that's actually correct, and we
should put padding elsewhere if we don't like it.

[Evan Stade, 2017/04/11 20:20:16]

I think whether it's 1x or 2x here defines whether the margin is technically on
top or both top and bottom. I don't have an opinion about which is more correct.
I actually think reserving no space in this case would be nicest (not even
close_->height()), and making the hit test update instead. But perhaps that
breaks some other random dialog.

           : 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