The 1st patch to disambiguate message center notifications

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/stl_util.h"
 #include "base/time/time.h"
@@ skipping 142 matching lines @@
 bool NotificationList::SetNotificationButtonIcon(
     const std::string& notification_id, int button_index,
     const gfx::Image& image) {
   Notifications::iterator iter = GetNotification(notification_id);
   if (iter == notifications_.end())
     return false;
   (*iter)->SetButtonIcon(button_index, image);
   return true;
 }
 
-bool NotificationList::HasNotification(const std::string& id) {
-  return GetNotification(id) != notifications_.end();
-}
-
 bool NotificationList::HasNotificationOfType(const std::string& id,
                                              const NotificationType type) {
   Notifications::iterator iter = GetNotification(id);
   if (iter == notifications_.end())
     return false;
 
   return (*iter)->type() == type;
 }
 
 bool NotificationList::HasPopupNotifications(
@@ skipping 87 matching lines @@
   quiet_mode_ = quiet_mode;
   if (quiet_mode_) {
     for (Notifications::iterator iter = notifications_.begin();
          iter != notifications_.end();
          ++iter) {
       (*iter)->set_shown_as_popup(true);
     }
   }
 }
 
+Notification* NotificationList::GetNotificationById(const std::string& id) {
+  Notifications::iterator iter = GetNotification(id);
+  if (iter != notifications_.end())
+    return *iter;
+  else

[dewittj, 2014/06/09 19:59:10]

nit: no else clause, just return null

[juyik, 2014/06/09 21:28:08]

Done.

+    return NULL;
+}
+
 NotificationList::Notifications NotificationList::GetVisibleNotifications(
     const NotificationBlockers& blockers) const {
   Notifications result;
   for (Notifications::const_iterator iter = notifications_.begin();
        iter != notifications_.end(); ++iter) {
     bool should_show = true;
     for (size_t i = 0; i < blockers.size(); ++i) {
       if (!blockers[i]->ShouldShowNotification((*iter)->notifier_id())) {
         should_show = false;
         break;
@@ skipping 56 matching lines @@
     notification->set_shown_as_popup(message_center_visible_
                                      || quiet_mode_
                                      || notification->shown_as_popup());
   }
   // Take ownership. The notification can only be removed from the list
   // in EraseNotification(), which will delete it.
   notifications_.insert(notification.release());
 }
 
 }  // namespace message_center