BubbleFrameView: add padding if platform dislikes close buttons

ui/views/bubble/bubble_frame_view_unittest.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 <memory>
 
 #include "base/macros.h"
 #include "build/build_config.h"
@@ skipping 18 matching lines @@
 const int kMinimumClientWidth = 100;
 const int kMinimumClientHeight = 200;
 const int kMaximumClientWidth = 300;
 const int kMaximumClientHeight = 300;
 const int kPreferredClientWidth = 150;
 const int kPreferredClientHeight = 250;
 
 // These account for non-client areas like the title bar, footnote etc. However
 // these do not take the bubble border into consideration.
 const int kExpectedAdditionalWidth = 12;
+#if defined(OS_MACOSX)
+// On Mac, since the close button is never visible, dialogs get an extra top
+// inset equal to the normal height of the close button, but this is considered
+// part of the inset, while it isn't on other platforms, so on Mac we have to
+// expect more additional height. Blech.
+const int kExpectedAdditionalHeight = 12 + 16;
+#else
 const int kExpectedAdditionalHeight = 12;
+#endif
 
 class TestBubbleFrameViewWidgetDelegate : public WidgetDelegate {
  public:
   TestBubbleFrameViewWidgetDelegate(Widget* widget) : widget_(widget) {}
 
   ~TestBubbleFrameViewWidgetDelegate() override {}
 
   // WidgetDelegate overrides:
   Widget* GetWidget() override { return widget_; }
   const Widget* GetWidget() const override { return widget_; }
@@ skipping 63 matching lines @@
 }  // namespace
 
 TEST_F(BubbleFrameViewTest, GetBoundsForClientView) {
   TestBubbleFrameView frame(this);
   EXPECT_EQ(kArrow, frame.bubble_border()->arrow());
   EXPECT_EQ(kColor, frame.bubble_border()->background_color());
 
   int margin_x = frame.content_margins().left();
   int margin_y = frame.content_margins().top();
   gfx::Insets insets = frame.bubble_border()->GetInsets();
+#if defined(OS_MACOSX)
+  // The insets are larger on Mac, to make up for the padding the close button
+  // would normally supply.
+  insets += gfx::Insets(16, 0, 0, 0);
+#endif
   EXPECT_EQ(insets.left() + margin_x, frame.GetBoundsForClientView().x());
   EXPECT_EQ(insets.top() + margin_y, frame.GetBoundsForClientView().y());
 }
 
 // Tests that the arrow is mirrored as needed to better fit the screen.
 TEST_F(BubbleFrameViewTest, GetUpdatedWindowBounds) {
   TestBubbleFrameView frame(this);
   gfx::Rect window_bounds;
 
   gfx::Insets insets = frame.bubble_border()->GetInsets();
@@ skipping 320 matching lines @@
   maximum_rect.Inset(frame.bubble_border()->GetInsets());
 
   // Should ignore the contents view's maximum size and use the preferred size.
   gfx::Size expected_size(kPreferredClientWidth + kExpectedAdditionalWidth,
                           kPreferredClientHeight + kExpectedAdditionalHeight);
   EXPECT_EQ(expected_size, maximum_rect.size());
 #endif
 }
 
 }  // namespace views