BubbleFrameView: add top padding even when close button is hidden

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"
 #include "ui/gfx/geometry/insets.h"
 #include "ui/gfx/geometry/rect.h"
 #include "ui/gfx/geometry/size.h"
 #include "ui/views/bubble/bubble_border.h"
+#include "ui/views/controls/button/image_button.h"
 #include "ui/views/test/test_views.h"
 #include "ui/views/test/views_test_base.h"
 #include "ui/views/widget/widget.h"
 #include "ui/views/widget/widget_delegate.h"
 
 namespace views {
 
 typedef ViewsTestBase BubbleFrameViewTest;
 
 namespace {
 
 const BubbleBorder::Arrow kArrow = BubbleBorder::TOP_LEFT;
 const SkColor kColor = SK_ColorRED;
 const int kMargin = 6;
 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;
-const int kExpectedAdditionalHeight = 12;
+// 12 for the builtin margin, 14 for the close button margin
+const int kExpectedAdditionalHeight = 12 + 14;
 
 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 62 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();
+  int close_y = frame.GetCloseButtonForTest()->height();

[msw, 2016/07/21 19:07:17]

nit: close_height

   gfx::Insets insets = frame.bubble_border()->GetInsets();
   EXPECT_EQ(insets.left() + margin_x, frame.GetBoundsForClientView().x());
-  EXPECT_EQ(insets.top() + margin_y, frame.GetBoundsForClientView().y());
+  EXPECT_EQ(insets.top() + margin_y + close_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();
   int xposition = 95 - insets.width();
 
@@ skipping 295 matching lines @@
                           kPreferredClientHeight + kExpectedAdditionalHeight);
   EXPECT_EQ(expected_size, preferred_rect.size());
 }
 
 TEST_F(BubbleFrameViewTest, GetMinimumSize) {
   TestBubbleFrameView frame(this);
   gfx::Rect minimum_rect(frame.GetMinimumSize());
   // Expect that a border has been added to the minimum size.
   minimum_rect.Inset(frame.bubble_border()->GetInsets());
 
+  ImageButton* button = frame.GetCloseButtonForTest();

[msw, 2016/07/21 19:07:18]

nit: inline below.

+  EXPECT_EQ(button->height(), 14);
+  EXPECT_EQ(nullptr, frame.GetCloseButtonForTest()->border());
   gfx::Size expected_size(kMinimumClientWidth + kExpectedAdditionalWidth,
                           kMinimumClientHeight + kExpectedAdditionalHeight);
   EXPECT_EQ(expected_size, minimum_rect.size());
 }
 
 TEST_F(BubbleFrameViewTest, GetMaximumSize) {
   TestBubbleFrameView frame(this);
   gfx::Rect maximum_rect(frame.GetMaximumSize());
 #if defined(OS_WIN)
   // On Windows, GetMaximumSize causes problems with DWM, so it should just be 0
   // (unlimited). See http://crbug.com/506206.
   EXPECT_EQ(gfx::Size(), maximum_rect.size());
 #else
   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