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

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 7ba6184978fd9c1610e9d93b43daf94618ea74f4..6c2255ee3d1ca9ce100744b64c3f770f4285d5da 100644
--- a/ui/views/bubble/bubble_frame_view.cc
+++ b/ui/views/bubble/bubble_frame_view.cc
@@ -257,7 +257,9 @@ gfx::Insets BubbleFrameView::GetInsets() const {
   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;