Move NotificationDelegate into message_center.

ui/message_center/message_center_impl.cc

 // Copyright (c) 2013 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_impl.h"
 
 #include "base/observer_list.h"
 #include "ui/message_center/message_center_observer.h"
 #include "ui/message_center/notification.h"
 #include "ui/message_center/notification_list.h"
@@ skipping 46 matching lines @@
 
 bool MessageCenterImpl::HasNotification(const std::string& id) {
   return notification_list_->HasNotification(id);
 }
 
 bool MessageCenterImpl::IsQuietMode() const {
   return notification_list_->quiet_mode();
 }
 
 bool MessageCenterImpl::HasClickedListener(const std::string& id) {
   return delegate_ && delegate_->HasClickedListener(id);

[Jun Mukai, 2013/05/24 01:29:19]

can you edit here to use GetDelegate?

[dewittj, 2013/05/24 18:01:00]

Done.

 }
 
 const NotificationList::Notifications& MessageCenterImpl::GetNotifications() {
   return notification_list_->GetNotifications();
 }
 
 NotificationList::PopupNotifications
     MessageCenterImpl::GetPopupNotifications() {
   return notification_list_->GetPopupNotifications();
 }
 
 //------------------------------------------------------------------------------
 // Client code interface.
 
 void MessageCenterImpl::AddNotification(
     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) {
+    const base::DictionaryValue* optional_fields,
+    NotificationDelegate* delegate) {
   // Sometimes the notification can be added with the same id and the
   // |notification_list| will replace the notification instead of adding new.
   // This is essentially an update rather than addition.
   bool already_exists = notification_list_->HasNotification(id);
-  notification_list_->AddNotification(type, id, title, message, display_source,
-                                      extension_id, optional_fields);
+  notification_list_->AddNotification(type,
+                                      id,
+                                      title,
+                                      message,
+                                      display_source,
+                                      extension_id,
+                                      optional_fields,
+                                      delegate);
   if (already_exists) {
     FOR_EACH_OBSERVER(MessageCenterObserver, observer_list_,
                       OnNotificationUpdated(id));
   } else {
     FOR_EACH_OBSERVER(MessageCenterObserver, observer_list_,
                       OnNotificationAdded(id));
   }
 }
 
 void MessageCenterImpl::UpdateNotification(
     const std::string& old_id,
     const std::string& new_id,
     const string16& title,
     const string16& message,
-    const base::DictionaryValue* optional_fields) {
+    const base::DictionaryValue* optional_fields,
+    NotificationDelegate* delegate) {
   notification_list_->UpdateNotificationMessage(
-      old_id, new_id, title, message, optional_fields);
+      old_id, new_id, title, message, optional_fields, delegate);
   if (old_id == new_id) {
     FOR_EACH_OBSERVER(MessageCenterObserver, observer_list_,
                       OnNotificationUpdated(new_id));
   } else {
     FOR_EACH_OBSERVER(MessageCenterObserver, observer_list_,
                       OnNotificationRemoved(old_id, false));
     FOR_EACH_OBSERVER(MessageCenterObserver, observer_list_,
                       OnNotificationAdded(new_id));
   }
 }
@@ skipping 103 matching lines @@
   notification_list_->MarkNotificationAsExpanded(id);
   FOR_EACH_OBSERVER(MessageCenterObserver, observer_list_,
                     OnNotificationUpdated(id));
 }
 
 void MessageCenterImpl::ClickOnNotification(const std::string& id) {
   if (!HasNotification(id))
     return;
   if (HasPopupNotifications())
     MarkSinglePopupAsShown(id, true);
-  FOR_EACH_OBSERVER(MessageCenterObserver, observer_list_,
-                    OnNotificationClicked(id));
+  NotificationDelegate* delegate =
+      notification_list_->GetNotificationDelegate(id);
+  if (delegate)
+    delegate->Click();
+  FOR_EACH_OBSERVER(
+      MessageCenterObserver, observer_list_, OnNotificationClicked(id));
 }
 
 void MessageCenterImpl::ClickOnNotificationButton(const std::string& id,
                                               int button_index) {
   if (!HasNotification(id))
     return;
   if (HasPopupNotifications())
     MarkSinglePopupAsShown(id, true);
-  FOR_EACH_OBSERVER(MessageCenterObserver, observer_list_,
+  NotificationDelegate* delegate =
+      notification_list_->GetNotificationDelegate(id);
+  if (delegate)
+    delegate->ButtonClick(button_index);
+  FOR_EACH_OBSERVER(MessageCenterObserver,
+                    observer_list_,
                     OnNotificationButtonClicked(id, button_index));
 }
 
 void MessageCenterImpl::MarkSinglePopupAsShown(const std::string& id,
                                                bool mark_notification_as_read) {
   if (!HasNotification(id))
     return;
   notification_list_->MarkSinglePopupAsShown(id, mark_notification_as_read);
   FOR_EACH_OBSERVER(MessageCenterObserver, observer_list_,
                     OnNotificationUpdated(id));
 }
 
 void MessageCenterImpl::DisplayedNotification(const std::string& id) {
   if (!HasNotification(id))
     return;
 
   if (HasPopupNotifications())
     notification_list_->MarkSinglePopupAsDisplayed(id);
-  FOR_EACH_OBSERVER(MessageCenterObserver, observer_list_,
-                    OnNotificationDisplayed(id));
+  NotificationDelegate* delegate =
+      notification_list_->GetNotificationDelegate(id);
+  if (delegate)
+    delegate->Display();
+  FOR_EACH_OBSERVER(
+      MessageCenterObserver, observer_list_, OnNotificationDisplayed(id));
 }
 
 void MessageCenterImpl::SetQuietMode(bool in_quiet_mode) {
   notification_list_->SetQuietMode(in_quiet_mode);
 }
 
 void MessageCenterImpl::EnterQuietModeWithExpire(
     const base::TimeDelta& expires_in) {
   notification_list_->EnterQuietModeWithExpire(expires_in);
 }
 
 }  // namespace message_center