Fixes the policy to choose the notifications for popups.

ui/message_center/notification_list.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/message_center/notification_list.h"
 
 #include "base/bind.h"
 #include "base/logging.h"
 #include "base/time.h"
 #include "base/values.h"
@@ skipping 216 matching lines @@
 
 void NotificationList::GetPopupNotifications(
     NotificationList::Notifications* notifications) {
   typedef std::pair<Notifications::iterator, Notifications::iterator>
       NotificationRange;
   // In the popup, latest should come earlier.
   std::list<NotificationRange> iters;
   for (int i = ui::notifications::DEFAULT_PRIORITY;
        i <= ui::notifications::MAX_PRIORITY; ++i) {
     Notifications::iterator first, last;
-    GetPopupIterators(i, first, last);
+    GetPopupIterators(i, &first, &last);
     if (first != last)
       iters.push_back(make_pair(first, last));
   }
   notifications->clear();
   while (!iters.empty()) {
     std::list<NotificationRange>::iterator max_iter = iters.begin();
     std::list<NotificationRange>::iterator iter = max_iter;
     iter++;
     for (; iter != iters.end(); ++iter) {
       if (max_iter->first->timestamp < iter->first->timestamp)
         max_iter = iter;
     }
     notifications->push_back(*(max_iter->first));
     ++(max_iter->first);
     if (max_iter->first == max_iter->second)
       iters.erase(max_iter);
   }
 }
 
 void NotificationList::MarkPopupsAsShown(int priority) {
   Notifications::iterator first, last;
-  GetPopupIterators(priority, first, last);
+  GetPopupIterators(priority, &first, &last);
   for (Notifications::iterator iter = first; iter != last; ++iter)
     iter->shown_as_popup = true;
 }
 
 void NotificationList::SetQuietMode(bool quiet_mode) {
   SetQuietModeInternal(quiet_mode);
   quiet_mode_timer_.reset();
 }
 
 void NotificationList::EnterQuietModeWithExpire(
@@ skipping 90 matching lines @@
       if (notification.priority > ui::notifications::MIN_PRIORITY)
         ++unread_count_;
       notification.is_read = false;
       notification.shown_as_popup = false;
     }
   }
   notifications_[notification.priority].push_front(notification);
 }
 
 void NotificationList::GetPopupIterators(int priority,
-                                         Notifications::iterator& first,
-                                         Notifications::iterator& last) {
+                                         Notifications::iterator* first,
+                                         Notifications::iterator* last) {
   Notifications& notifications = notifications_[priority];
   // No popups for LOW/MIN priority.
   if (priority < ui::notifications::DEFAULT_PRIORITY) {
-    first = notifications.end();
-    last = notifications.end();
+    *first = notifications.end();
+    *last = notifications.end();
     return;
   }
 
   size_t popup_count = 0;
-  first = notifications.begin();
-  last = first;
-  while (last != notifications.end()) {
-    if (last->shown_as_popup)
+  *first = notifications.begin();
+  *last = *first;
+  while (*last != notifications.end()) {
+    if ((*last)->shown_as_popup)
       break;
-    ++last;
-    popup_count++;
-    // No limits for HIGH/MAX priority.
+    ++(*last);
+
+    // Checking limits. No limits for HIGH/MAX priority. DEFAULT priority
+    // will return at most kMaxVisiblePopupNotifications entries. If the
+    // popup entries are more, older entries are used. see crbug.com/165768
     if (priority == ui::notifications::DEFAULT_PRIORITY &&
         popup_count >= kMaxVisiblePopupNotifications) {
-      break;
+      ++(*first);
+    } else {
+      ++popup_count;
     }
   }
 }
 
 }  // namespace message_center