Don't shrink the message center height while open

ui/message_center/views/message_center_view.cc

 // Copyright (c) 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 <list>
 #include <map>
 
 #include "base/macros.h"
 #include "base/memory/weak_ptr.h"
 #include "base/message_loop/message_loop.h"
 #include "base/stl_util.h"
 #include "build/build_config.h"
 #include "ui/base/l10n/l10n_util.h"
 #include "ui/gfx/animation/multi_animation.h"
 #include "ui/gfx/canvas.h"
 #include "ui/gfx/geometry/insets.h"
 #include "ui/gfx/geometry/rect.h"
 #include "ui/gfx/geometry/size.h"
 #include "ui/message_center/message_center.h"
 #include "ui/message_center/message_center_style.h"
 #include "ui/message_center/message_center_tray.h"
 #include "ui/message_center/message_center_types.h"
+#include "ui/message_center/views/custom_notification_view.h"
 #include "ui/message_center/views/message_center_button_bar.h"
 #include "ui/message_center/views/message_list_view.h"
 #include "ui/message_center/views/message_view.h"
 #include "ui/message_center/views/message_view_context_menu_controller.h"
 #include "ui/message_center/views/message_view_factory.h"
 #include "ui/message_center/views/notifier_settings_view.h"
 #include "ui/resources/grit/ui_resources.h"
 #include "ui/strings/grit/ui_strings.h"
 #include "ui/views/background.h"
 #include "ui/views/border.h"
@@ skipping 63 matching lines @@
   scroller_->SetVerticalScrollBar(new views::OverlayScrollBar(false));
   scroller_->SetHorizontalScrollBar(new views::OverlayScrollBar(true));
   scroller_->set_background(
       views::Background::CreateSolidBackground(kMessageCenterBackgroundColor));
 
   scroller_->SetPaintToLayer();
   scroller_->layer()->SetFillsBoundsOpaquely(false);
   scroller_->layer()->SetMasksToBounds(true);
 
   message_list_view_.reset(new MessageListView());
+  message_list_view_->set_scroller(scroller_);
   message_list_view_->set_owned_by_client();
   message_list_view_->AddObserver(this);
 
   // We want to swap the contents of the scroll view between the empty list
   // view and the message list view, without constructing them afresh each
   // time.  So, since the scroll view deletes old contents each time you
   // set the contents (regardless of the |owned_by_client_| setting) we need
   // an intermediate view for the contents whose children we can swap in and
   // out.
   views::View* scroller_contents = new views::View();
@@ skipping 270 matching lines @@
   Update(true /* animate */);
 }
 
 // This is a separate function so we can override it in tests.
 bool MessageCenterView::SetRepositionTarget() {
   // Set the item on the mouse cursor as the reposition target so that it
   // should stick to the current position over the update.
   if (message_list_view_->IsMouseHovered()) {
     for (const auto& hover_id_view : notification_views_) {
       MessageView* hover_view = hover_id_view.second;
+
+      // Skip if the view is a custom view. Custom views can be expanded by

[Eliot Courtney, 2017/04/11 00:58:26]

discussed offline: We want to keep the on-hover reposition target behaviour for
custom notifications as well, so we (probably?) still need to set the reposition
target here.

[yoshiki, 2017/04/11 07:46:26]

I just removed this, since the reason I added this code is fixed by a recent
patch in Android.

+      // click and we don't want to stick to the target on expansion by user
+      // action.
+      // TODO(yoshiki): Distinguish if the update event comes from user action
+      // or not, and skip only in the case of user action
+      if (hover_view->GetClassName() == CustomNotificationView::kViewClassName)
+        continue;
+
       if (hover_view->IsMouseHovered()) {
         message_list_view_->SetRepositionTarget(hover_view->bounds());
         return true;
       }
     }
   }
   return false;
 }
 
 void MessageCenterView::OnNotificationUpdated(const std::string& id) {
@@ skipping 257 matching lines @@
     // Disable the close-all button since no notification is visible.
     button_bar_->SetCloseAllButtonEnabled(false);
   }
 }
 
 void MessageCenterView::SetNotificationViewForTest(MessageView* view) {
   message_list_view_->AddNotificationAt(view, 0);
 }
 
 }  // namespace message_center