Notificaitons refactor step 2

ui/message_center/message_center.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/message_center.h"
 
 #include "base/logging.h"
 #include "base/memory/singleton.h"
 #include "base/observer_list.h"
+#include "ui/message_center/notification.h"
+#include "ui/message_center/notification_list.h"
 
 namespace message_center {
 
 //------------------------------------------------------------------------------
 MessageCenter::MessageCenter()
     : delegate_(NULL) {
   notification_list_.reset(new NotificationList(this));
 }
 
 MessageCenter::~MessageCenter() {
@@ skipping 25 matching lines @@
 }
 
 bool MessageCenter::HasPopupNotifications() const {
   return notification_list_->HasPopupNotifications();
 }
 
 //------------------------------------------------------------------------------
 // Client code interface.
 
 void MessageCenter::AddNotification(
-    ui::notifications::NotificationType type,
+    NotificationType type,
     const std::string& id,
     const string16& title,
     const string16& message,
     const string16& display_source,
     const std::string& extension_id,
     const base::DictionaryValue* optional_fields) {
   notification_list_->AddNotification(type, id, title, message, display_source,
                                       extension_id, optional_fields);
   NotifyMessageCenterChanged(true);
 }
 
 void MessageCenter::UpdateNotification(
     const std::string& old_id,
     const std::string& new_id,
     const string16& title,
     const string16& message,
     const base::DictionaryValue* optional_fields) {
   notification_list_->UpdateNotificationMessage(
       old_id, new_id, title, message, optional_fields);
   NotifyMessageCenterChanged(true);
 }
 
 void MessageCenter::RemoveNotification(const std::string& id) {
-  if (!notification_list_->RemoveNotification(id))
-    return;
+  notification_list_->RemoveNotification(id);
   NotifyMessageCenterChanged(false);
 }
 
 void MessageCenter::SetNotificationIcon(const std::string& notification_id,
                                         const gfx::ImageSkia& image) {
   if (notification_list_->SetNotificationIcon(notification_id, image))
     NotifyMessageCenterChanged(true);
 }
 
 void MessageCenter::SetNotificationImage(const std::string& notification_id,
@@ skipping 13 matching lines @@
 //------------------------------------------------------------------------------
 // Overridden from NotificationList::Delegate.
 
 void MessageCenter::SendRemoveNotification(const std::string& id) {
   if (delegate_)
     delegate_->NotificationRemoved(id);
 }
 
 void MessageCenter::SendRemoveAllNotifications() {
   if (delegate_) {
-    NotificationList::Notifications notifications;
-    notification_list_->GetNotifications(&notifications);
+    const NotificationList::Notifications& notifications =
+        notification_list_->GetNotifications();
     for (NotificationList::Notifications::const_iterator loopiter =
              notifications.begin();
          loopiter != notifications.end(); ) {
       NotificationList::Notifications::const_iterator curiter = loopiter++;
-      std::string notification_id = curiter->id;
+      std::string notification_id = (*curiter)->id();
       // May call RemoveNotification and erase curiter.
       delegate_->NotificationRemoved(notification_id);
     }
   }
 }
 
 void MessageCenter::DisableNotificationByExtension(
     const std::string& id) {
   if (delegate_)
     delegate_->DisableExtension(id);
@@ skipping 52 matching lines @@
 // Private.
 
 void MessageCenter::NotifyMessageCenterChanged(bool new_notification) {
   FOR_EACH_OBSERVER(Observer,
                     observer_list_,
                     OnMessageCenterChanged(new_notification));
 }
 
 
 }  // namespace message_center