Don't shrink the message center height while open

ui/message_center/views/message_center_view_unittest.cc

 // Copyright 2013 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/message_center/views/message_center_view.h"
 
 #include <map>
 #include <memory>
 #include <utility>
 
@@ skipping 108 matching lines @@
 // in it, hence MockMessageCenterView.
 class MockMessageCenterView : public MessageCenterView {
  public:
   MockMessageCenterView(MessageCenter* message_center,
                         MessageCenterTray* tray,
                         int max_height,
                         bool initially_settings_visible);
 
   bool SetRepositionTarget() override;
 
+  void PreferredSizeChanged() override;
+
  private:
   DISALLOW_COPY_AND_ASSIGN(MockMessageCenterView);
 };
 
 MockMessageCenterView::MockMessageCenterView(MessageCenter* message_center,
                                              MessageCenterTray* tray,
                                              int max_height,
                                              bool initially_settings_visible)
     : MessageCenterView(message_center,
                         tray,
                         max_height,
                         initially_settings_visible) {}
 
 // Always say that the current reposition session is still active, by
 // returning true. Normally the reposition session is set based on where the
 // mouse is hovering.
 bool MockMessageCenterView::SetRepositionTarget() {
   return true;
 }
 
+void MockMessageCenterView::PreferredSizeChanged() {
+  SetSize(GetPreferredSize());
+  MessageCenterView::PreferredSizeChanged();
+}
+
 /* Test fixture ***************************************************************/
 
 class MessageCenterViewTest : public views::ViewsTestBase,
                               public MockNotificationView::Test,
                               public MessageCenterController {
  public:
   // Expose the private enum class MessageCenter::Mode for this test.
   using Mode = MessageCenterView::Mode;
 
   MessageCenterViewTest();
@@ skipping 81 matching lines @@
       message_center::RichNotificationData(), nullptr);
 
   // ...and a list for it.
   notifications_[std::string(kNotificationId1)] = std::move(notification1);
   notifications_[std::string(kNotificationId2)] = std::move(notification2);
   NotificationList::Notifications notifications = Notifications();
   message_center_->SetVisibleNotifications(notifications);
 
   // Then create a new MockMessageCenterView with that single notification.
   message_center_view_.reset(
-      new MockMessageCenterView(message_center_.get(), NULL, 100, false));
+      new MockMessageCenterView(message_center_.get(), NULL, 600, false));
   GetMessageListView()->quit_message_loop_after_animation_for_test_ = true;
-  GetMessageCenterView()->SetBounds(0, 0, 380, 600);
+  GetMessageCenterView()->SetBounds(0, 0, 380, 100);
   message_center_view_->SetNotifications(notifications);
   message_center_view_->set_owned_by_client();
 
   widget_.reset(new views::Widget());
   views::Widget::InitParams params =
       CreateParams(views::Widget::InitParams::TYPE_POPUP);
   params.ownership = views::Widget::InitParams::WIDGET_OWNS_NATIVE_WIDGET;
   params.bounds = gfx::Rect(50, 50, 650, 650);
   widget_->Init(params);
   views::View* root = widget_->GetRootView();
@@ skipping 290 matching lines @@
       GetMessageListView()->width() - GetMessageListView()->GetInsets().width();
   EXPECT_EQ(
       GetMessageListView()->height(),
       GetNotificationView(kNotificationId1)->GetHeightForWidth(width) +
           (kMarginBetweenItems - MessageView::GetShadowInsets().bottom()) +
           GetNotificationView(kNotificationId2)->GetHeightForWidth(width) +
           GetMessageListView()->GetInsets().height());
 }
 
 TEST_F(MessageCenterViewTest, SizeAfterRemove) {
+  int original_height = GetMessageListView()->height();
   EXPECT_EQ(2, GetMessageListView()->child_count());
   RemoveNotification(kNotificationId1, false);
 
   // Wait until the animation finishes if available.
   if (GetAnimator()->IsAnimating())
     base::RunLoop().Run();
 
   EXPECT_EQ(1, GetMessageListView()->child_count());
 
-  int width =
-      GetMessageListView()->width() - GetMessageListView()->GetInsets().width();
   EXPECT_FALSE(GetNotificationView(kNotificationId1));
   EXPECT_TRUE(GetNotificationView(kNotificationId2));
-  EXPECT_EQ(GetMessageListView()->height(),
-            GetNotificationView(kNotificationId2)->GetHeightForWidth(width) +
-                GetMessageListView()->GetInsets().height());
+  EXPECT_EQ(GetMessageListView()->height(), original_height);
 }
 
 TEST_F(MessageCenterViewTest, PositionAfterUpdate) {
   // Make sure that the notification 2 is placed above the notification 1.
   EXPECT_LT(GetNotificationView(kNotificationId2)->bounds().y(),
             GetNotificationView(kNotificationId1)->bounds().y());
 
   int previous_vertical_pos_from_bottom =
       GetMessageListView()->height() -
       GetNotificationView(kNotificationId1)->bounds().y();
@@ skipping 24 matching lines @@
 TEST_F(MessageCenterViewTest, PositionAfterRemove) {
   // Make sure that the notification 2 is placed above the notification 1.
   EXPECT_LT(GetNotificationView(kNotificationId2)->bounds().y(),
             GetNotificationView(kNotificationId1)->bounds().y());
 
   GetMessageListView()->SetRepositionTargetForTest(
       GetNotificationView(kNotificationId2)->bounds());
   int previous_height = GetMessageListView()->height();
   int previous_notification2_y =
       GetNotificationView(kNotificationId2)->bounds().y();
-  int previous_notification2_height =
-      GetNotificationView(kNotificationId2)->bounds().height();
 
   EXPECT_EQ(2, GetMessageListView()->child_count());
   RemoveNotification(kNotificationId2, false);
 
   // Wait until the animation finishes if available.
   if (GetAnimator()->IsAnimating())
     base::RunLoop().Run();
 
   EXPECT_EQ(1, GetMessageListView()->child_count());
 
   // Confirm that notification 1 is moved up to the place on which the
   // notification 2 was.
   EXPECT_EQ(previous_notification2_y,
             GetNotificationView(kNotificationId1)->bounds().y());
   // The size should be kept.
   EXPECT_EQ(previous_height, GetMessageListView()->height());
 
   // Notification 2 is successfully removed.
   EXPECT_FALSE(GetNotificationView(kNotificationId2));
   EXPECT_TRUE(GetNotificationView(kNotificationId1));
 
   // Mouse cursor moves out of the message center. This resets the reposition
   // target in the message list.
   FireOnMouseExitedEvent();
 
-  // The height should shrink from the height of the removed notification 2.
-  EXPECT_EQ(previous_height - previous_notification2_height -
-                (kMarginBetweenItems - MessageView::GetShadowInsets().bottom()),
-            GetMessageListView()->height());
+  // The height should be kept even after the cursor moved out.
+  EXPECT_EQ(previous_height, GetMessageListView()->height());
 }
 
 TEST_F(MessageCenterViewTest, CloseButton) {
   views::Button* close_button = GetButtonBar()->GetCloseAllButtonForTest();
   EXPECT_NE(nullptr, close_button);
 
   ((views::ButtonListener*)GetButtonBar())
       ->ButtonPressed(close_button, DummyEvent());
   base::RunLoop().Run();
   EXPECT_TRUE(GetMessageCenter()->remove_all_closable_notification_called_);
@@ skipping 281 matching lines @@
       base::UTF8ToUTF16("title1"), base::UTF8ToUTF16("message"), gfx::Image(),
       base::UTF8ToUTF16("display source"), GURL(),
       NotifierId(NotifierId::APPLICATION, "extension_id"),
       message_center::RichNotificationData(), nullptr));
 
   GetMessageCenterView()->SizeToPreferredSize();
   EXPECT_NE(kEmptyMessageCenterViewHeight, GetMessageCenterView()->height());
 }
 
 }  // namespace message_center