Makes mouse-hover prevent notification toasts from moving.

ui/message_center/views/message_popup_collection.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_popup_collection.h"
 
 #include <set>
 
 #include "base/bind.h"
 #include "base/logging.h"
@@ skipping 15 matching lines @@
 #include "ui/views/view.h"
 #include "ui/views/widget/widget.h"
 #include "ui/views/widget/widget_delegate.h"
 
 namespace message_center {
 namespace {
 
 // Timeout between the last user-initiated close of the toast and the moment
 // when normal layout/update of the toast stack continues. If the last toast was
 // just closed, the timeout is shorter.
-const int kUpdateTimeoutOnUserActionMs = 2000;
-const int kUpdateTimeoutOnUserActionEmptyMs = 700;
+const int kMouseExitedDeferTimeoutMs = 200;
 
 const int kToastMargin = kMarginBetweenItems;
 
 }  // namespace.
 
 MessagePopupCollection::MessagePopupCollection(gfx::NativeView parent,
                                                MessageCenter* message_center)
     : parent_(parent),
       message_center_(message_center),
       defer_counter_(0),
+      latest_toast_entered_(NULL),
       user_is_closing_toasts_by_clicking_(false) {
   DCHECK(message_center_);
   defer_timer_.reset(new base::OneShotTimer<MessagePopupCollection>);
   DoUpdateIfPossible();
   message_center_->AddObserver(this);
 }
 
 MessagePopupCollection::~MessagePopupCollection() {
   message_center_->RemoveObserver(this);
   CloseAllWidgets();
@@ skipping 43 matching lines @@
     toasts_.push_back(toast);
 
     toast->RevealWithAnimation(
         gfx::Point(base_position.x() - kToastMargin, bottom));
     bottom -= view_height + kToastMargin;
 
     message_center_->DisplayedNotification((*iter)->id());
   }
 }
 
-void MessagePopupCollection::OnMouseEntered() {
+void MessagePopupCollection::OnMouseEntered(ToastContentsView* toast_entered) {
+  // Sometimes we can get two MouseEntered/MouseExited in a row when animating
+  // toasts.  So we need to keep track of which one is the currently active one.
+  latest_toast_entered_ = toast_entered;
+
   for (Toasts::iterator iter = toasts_.begin(); iter != toasts_.end(); ++iter) {
     (*iter)->SuspendTimer();
   }
+
+  if (user_is_closing_toasts_by_clicking_)
+    defer_timer_->Stop();
 }
 
-void MessagePopupCollection::OnMouseExited() {
-  for (Toasts::iterator iter = toasts_.begin(); iter != toasts_.end(); ++iter) {
-    (*iter)->StartTimer();
+void MessagePopupCollection::OnMouseExited(ToastContentsView* toast_exited) {
+  // If we're exiting a toast after entering a different toast, then ignore
+  // this mouse event.
+  if (toast_exited != latest_toast_entered_)
+    return;
+  latest_toast_entered_ = NULL;
+
+  if (user_is_closing_toasts_by_clicking_) {
+    defer_timer_->Start(
+        FROM_HERE,
+        base::TimeDelta::FromMilliseconds(kMouseExitedDeferTimeoutMs),
+        this,
+        &MessagePopupCollection::OnDeferTimerExpired);
+  } else {
+    for (Toasts::iterator iter = toasts_.begin();
+         iter != toasts_.end();
+         ++iter) {
+      (*iter)->StartTimer();
+    }
   }
 }
 
 void MessagePopupCollection::CloseAllWidgets() {
   for (Toasts::iterator iter = toasts_.begin(); iter != toasts_.end();) {
     // the toast can be removed from toasts_ during CloseWithAnimation().
     Toasts::iterator curiter = iter++;
     (*curiter)->CloseWithAnimation();
   }
   DCHECK(toasts_.empty());
@@ skipping 85 matching lines @@
     // normal locations after tracking the mouse pointer for easy deletion.
     // This provides a period of time when toasts are easy to remove because
     // they re-position themselves to have Close button right under the mouse
     // pointer. If the user continue to remove the toasts, the delay is reset.
     // Once user stopped removing the toasts, the toasts re-populate/rearrange
     // after the specified delay.
     if (!user_is_closing_toasts_by_clicking_) {
       user_is_closing_toasts_by_clicking_ = true;
       IncrementDeferCounter();
     }
-    int update_timeout =
-        toasts_.empty() ? kUpdateTimeoutOnUserActionEmptyMs :
-                          kUpdateTimeoutOnUserActionMs;
-    defer_timer_->Start(
-        FROM_HERE,
-        base::TimeDelta::FromMilliseconds(update_timeout),
-        this,
-        &MessagePopupCollection::OnDeferTimerExpired);
   }
 }
 
 void MessagePopupCollection::OnDeferTimerExpired() {
   user_is_closing_toasts_by_clicking_ = false;
   DecrementDeferCounter();
+
+  for (Toasts::iterator iter = toasts_.begin(); iter != toasts_.end(); ++iter) {
+    (*iter)->StartTimer();
+  }
 }
 
 void MessagePopupCollection::OnNotificationUpdated(
     const std::string& notification_id) {
   // Find a toast.
   Toasts::iterator toast_iter = toasts_.begin();
   for (; toast_iter != toasts_.end(); ++toast_iter) {
     if ((*toast_iter)->id() == notification_id)
       break;
   }
@@ skipping 100 matching lines @@
       views::Widget* widget = (*iter)->GetWidget();
       if (widget)
         return widget->GetWindowBoundsInScreen();
       break;
     }
   }
   return gfx::Rect();
 }
 
 }  // namespace message_center