The 1st patch to disambiguate message center notifications

ui/message_center/notification_list.h

 // 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.
 
 #ifndef UI_MESSAGE_CENTER_NOTIFICATION_LIST_H_
 #define UI_MESSAGE_CENTER_NOTIFICATION_LIST_H_
 
 #include <list>
 #include <set>
 #include <string>
@@ skipping 66 matching lines @@
 
   // Returns true if the notification exists and was updated.
   bool SetNotificationImage(const std::string& notification_id,
                             const gfx::Image& image);
 
   // Returns true if the notification and button exist and were updated.
   bool SetNotificationButtonIcon(const std::string& notification_id,
                                  int button_index,
                                  const gfx::Image& image);
 
-  // Returns true if |id| matches a notification in the list.
-  bool HasNotification(const std::string& id);
-
   // Returns true if |id| matches a notification in the list and that
   // notification's type matches the given type.
   bool HasNotificationOfType(const std::string& id,
                              const NotificationType type);
 
   // Returns false if the first notification has been shown as a popup (which
   // means that all notifications have been shown).
   bool HasPopupNotifications(const NotificationBlockers& blockers);
 
   // Returns the recent notifications of the priority higher then LOW,
@@ skipping 18 matching lines @@
 
   bool quiet_mode() const { return quiet_mode_; }
 
   // Sets the current quiet mode status to |quiet_mode|.
   void SetQuietMode(bool quiet_mode);
 
   // Sets the current quiet mode to true. The quiet mode will expire in the
   // specified time-delta from now.
   void EnterQuietModeWithExpire(const base::TimeDelta& expires_in);
 
+  // Returns the notification with the corresponding id. If not found, returns
+  // NULL. Notification instance is owned by this list.
+  Notification* GetNotificationById(const std::string& id);
+
   // Returns all visible notifications, in a (priority-timestamp) order.
   // Suitable for rendering notifications in a MessageCenter.
   Notifications GetVisibleNotifications(
       const NotificationBlockers& blockers) const;
   size_t NotificationCount(const NotificationBlockers& blockers) const;
   size_t UnreadCount(const NotificationBlockers& blockers) const;
 
   bool is_message_center_visible() const { return message_center_visible_; }
 
  private:
@@ skipping 11 matching lines @@
   Notifications notifications_;
   bool message_center_visible_;
   bool quiet_mode_;
 
   DISALLOW_COPY_AND_ASSIGN(NotificationList);
 };
 
 }  // namespace message_center
 
 #endif // UI_MESSAGE_CENTER_NOTIFICATION_LIST_H_