Move NotificationDelegate into message_center.

chrome/browser/notifications/message_center_notification_manager.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 "chrome/browser/notifications/message_center_notification_manager.h"
 
 #include "base/logging.h"
 #include "base/memory/scoped_ptr.h"
 #include "base/prefs/pref_service.h"
 #include "chrome/browser/extensions/extension_info_map.h"
@@ skipping 133 matching lines @@
       old_notification->notification().Close(false); // Not by user.
       delete old_notification;
       profile_notifications_.erase(old_id);
       ProfileNotification* new_notification =
           new ProfileNotification(profile, notification, message_center_);
       profile_notifications_[notification.notification_id()] = new_notification;
       message_center_->UpdateNotification(old_id,
                                           notification.notification_id(),
                                           notification.title(),
                                           notification.body(),
-                                          notification.optional_fields());
+                                          notification.optional_fields(),
+                                          notification.delegate());
       new_notification->StartDownloads();
       return true;
     }
   }
   return false;
 }
 
 ////////////////////////////////////////////////////////////////////////////////
 // MessageCenter::Delegate
 
@@ skipping 56 matching lines @@
     chrome::ShowContentSettings(browser, CONTENT_SETTINGS_TYPE_NOTIFICATIONS);
   else
     chrome::ShowExtensions(browser, std::string());
 }
 
 void MessageCenterNotificationManager::ShowSettingsDialog(
     gfx::NativeView context) {
   settings_controller_->ShowSettingsDialog(context);
 }
 
-bool MessageCenterNotificationManager::HasClickedListener(
-    const std::string& notification_id) {
-  ProfileNotification* profile_notification =
-      FindProfileNotification(notification_id);
-  return profile_notification &&
-      profile_notification->notification().HasClickedListener();
-}
-
 ////////////////////////////////////////////////////////////////////////////////
 // MessageCenter::Observer
 void MessageCenterNotificationManager::OnNotificationRemoved(
     const std::string& notification_id,
     bool by_user) {
   // Do not call FindProfileNotification(). Some tests create notifications
   // directly to MessageCenter, but this method will be called for the removals
   // of such notifications.
   NotificationMap::const_iterator iter =
       profile_notifications_.find(notification_id);
   if (iter != profile_notifications_.end())
     RemoveProfileNotification(iter->second, by_user);
 }
 
-void MessageCenterNotificationManager::OnNotificationClicked(
-    const std::string& notification_id) {
-  ProfileNotification* profile_notification =
-      FindProfileNotification(notification_id);
-  if (!profile_notification)
-    return;
-  profile_notification->notification().Click();
-}
-
-void MessageCenterNotificationManager::OnNotificationButtonClicked(
-    const std::string& notification_id,
-    int button_index) {
-  ProfileNotification* profile_notification =
-      FindProfileNotification(notification_id);
-  if (!profile_notification)
-    return;
-  profile_notification->notification().ButtonClick(button_index);
-}
-
-void MessageCenterNotificationManager::OnNotificationDisplayed(
-    const std::string& notification_id) {
-  FindProfileNotification(notification_id)->notification().Display();
-}
-
 ////////////////////////////////////////////////////////////////////////////////
 // ImageDownloads
 
 MessageCenterNotificationManager::ImageDownloads::ImageDownloads(
     message_center::MessageCenter* message_center,
     ImageDownloadsObserver* observer)
     : message_center_(message_center),
       pending_downloads_(0),
       observer_(observer) {
 }
@@ skipping 179 matching lines @@
   // Notification ids should be unique.
   DCHECK(profile_notifications_.find(id) == profile_notifications_.end());
   profile_notifications_[id] = profile_notification;
 
   message_center_->AddNotification(notification.type(),
                                    notification.notification_id(),
                                    notification.title(),
                                    notification.body(),
                                    notification.display_source(),
                                    profile_notification->GetExtensionId(),
-                                   notification.optional_fields());
+                                   notification.optional_fields(),
+                                   notification.delegate());
   profile_notification->StartDownloads();
 }
 
 void MessageCenterNotificationManager::RemoveProfileNotification(
     ProfileNotification* profile_notification,
     bool by_user) {
   profile_notification->notification().Close(by_user);
   std::string id = profile_notification->notification().notification_id();
   profile_notifications_.erase(id);
   delete profile_notification;
 }
 
 MessageCenterNotificationManager::ProfileNotification*
     MessageCenterNotificationManager::FindProfileNotification(
         const std::string& id) const {
   NotificationMap::const_iterator iter = profile_notifications_.find(id);
   if (iter == profile_notifications_.end())
     return NULL;
 
   return (*iter).second;
 }