Start delegating notifications to MessageCenter on Windows.

chrome/browser/notifications/message_center_notification_manager.cc

Index: chrome/browser/notifications/message_center_notification_manager.cc
diff --git a/chrome/browser/notifications/message_center_notification_manager.cc b/chrome/browser/notifications/message_center_notification_manager.cc
index ca42a47324075b99d39a98500993d168eaee60fb..a1e8faf33193397ba42afc3ad984ee9b34aecb22 100644
--- a/chrome/browser/notifications/message_center_notification_manager.cc
+++ b/chrome/browser/notifications/message_center_notification_manager.cc
@@ -6,24 +6,52 @@
 
 #include "base/logging.h"
 #include "base/memory/scoped_ptr.h"
+#include "chrome/browser/extensions/extension_service.h"
 #include "chrome/browser/notifications/notification.h"
 #include "chrome/browser/prefs/pref_service.h"
+#include "chrome/browser/profiles/profile.h"
+#include "chrome/common/extensions/extension_set.h"
 #include "chrome/common/pref_names.h"
 
+#if defined(USE_ASH)
+#include "ash/shell.h"
+#else
+#include "chrome/browser/browser_process.h"
+#endif
+
+namespace {
+message_center::MessageCenter* GetMessageCenterInstance() {
+#if defined (USE_ASH)
+  return ash::Shell::GetInstance()->message_center();
+#else
+  return g_browser_process->message_center();
+#endif

[stevenjb, 2013/01/18 19:56:19]

Would it make sense for MessageCenter* to be passed to this class in the
constructor, to avoid dependencies here on browser_process / shall?

[Dmitry Titov, 2013/01/18 21:23:00]

I just tried that, but found that it causes BrowserProcessImpl to know about
ash::Shell which it currently doesn't - because to pass the MessageCenter, the
BrowserProcessImpl that creates NotificationUIManager on all platforms, will
need to pull MessageCenter from ash::Shell.

It seems we want MessageCenter to live on ash::Shell in case of USE_ASH, that
makes WebNotificationTray testable w/o a browser. So there is going to be some
place that knows that MessageCenter can be pulled from Shell or some other
place... I'm very open to suggestions here.

[stevenjb, 2013/01/18 22:50:04]

I see. So MessageCenter is owned by either ash::Shell or BrowserProcess, but
MessageCenterNotificationManager is always owned by BrowserProcess. Hmm.

I think it might be a little clearer to me to have this logic in
NotificationUIManager::Create(), since that already determines whether or not to
construct MessageCenterNotificationManager at all. I'll leave that to your
judgement however.

+}
+}
+
 MessageCenterNotificationManager::MessageCenterNotificationManager() {
+  message_center_ = GetMessageCenterInstance();
+  message_center_->SetDelegate(this);
 }
 
 MessageCenterNotificationManager::~MessageCenterNotificationManager() {
 }
 
+////////////////////////////////////////////////////////////////////////////////
+// NotificationUIManager
+
 bool MessageCenterNotificationManager::CancelById(const std::string& id) {
   // See if this ID hasn't been shown yet.
   if (NotificationUIManagerImpl::CancelById(id))
     return true;
 
   // If it has been shown, remove it.
-  NOTIMPLEMENTED();
-  return false;
+  NotificationMap::iterator iter = profile_notifications_.find(id);
+  if (iter == profile_notifications_.end())
+    return false;
+
+  RemoveProfileNotification((*iter).second);
+  return true;
 }
 
 bool MessageCenterNotificationManager::CancelAllBySourceOrigin(
@@ -32,34 +60,169 @@ bool MessageCenterNotificationManager::CancelAllBySourceOrigin(
   // because there may be multiple notifications from the same source.
   bool removed = NotificationUIManagerImpl::CancelAllBySourceOrigin(source);
 
-  NOTIMPLEMENTED();
-  return false || removed;
+  for (NotificationMap::iterator loopiter = profile_notifications_.begin();
+       loopiter != profile_notifications_.end(); ) {
+    NotificationMap::iterator curiter = loopiter++;
+    if ((*curiter).second->notification().origin_url() == source) {
+      RemoveProfileNotification((*curiter).second);
+      removed = true;
+    }
+  }
+  return removed;
 }
 
 bool MessageCenterNotificationManager::CancelAllByProfile(Profile* profile) {
   // Same pattern as CancelAllBySourceOrigin.
   bool removed = NotificationUIManagerImpl::CancelAllByProfile(profile);
 
-  NOTIMPLEMENTED();
-  return false || removed;
+  for (NotificationMap::iterator loopiter = profile_notifications_.begin();
+       loopiter != profile_notifications_.end(); ) {
+    NotificationMap::iterator curiter = loopiter++;
+    if ((*curiter).second->profile()->IsSameProfile(profile)) {
+      RemoveProfileNotification((*curiter).second);
+      removed = true;
+    }
+  }
+  return removed;
 }
 
 void MessageCenterNotificationManager::CancelAll() {
   NotificationUIManagerImpl::CancelAll();
-  NOTIMPLEMENTED();
+
+  for (NotificationMap::iterator loopiter = profile_notifications_.begin();
+       loopiter != profile_notifications_.end(); ) {
+    RemoveProfileNotification((*loopiter++).second);
+  }
 }
 
+////////////////////////////////////////////////////////////////////////////////
+// NotificationUIManagerImpl
+
 bool MessageCenterNotificationManager::ShowNotification(
     const Notification& notification, Profile* profile) {
-  NOTIMPLEMENTED();
+  // There is always space in MessageCenter, it never rejects Notifications.
+  AddProfileNotification(new ProfileNotification(profile, notification));
   return true;
 }
 
 bool MessageCenterNotificationManager::UpdateNotification(
-    const Notification& notification) {
+    const Notification& notification, Profile* profile) {
   const string16& replace_id = notification.replace_id();
   DCHECK(!replace_id.empty());
+  const GURL origin_url = notification.origin_url();
+  DCHECK(origin_url.is_valid());
 
-  NOTIMPLEMENTED();
+  // Since replace_id is provided by arbitrary JS, we need to use origin_url
+  // (which is an app url in case of app/extension) to scope the replace ids
+  // in the given profile.
+  for (NotificationMap::iterator iter = profile_notifications_.begin();
+       iter != profile_notifications_.end(); ++iter) {
+    ProfileNotification* old_notification = (*iter).second;
+    if (old_notification->notification().replace_id() == replace_id &&
+        old_notification->notification().origin_url() == origin_url &&
+        old_notification->profile()->IsSameProfile(profile)) {
+      std::string old_id =
+          old_notification->notification().notification_id();
+      DCHECK(message_center_->GetNotificationList()->HasNotification(old_id));
+
+      // Add/remove notification in the local list but just update the same
+      // one in MessageCenter.
+      old_notification->notification().Close(false); // Not by user.
+      delete old_notification;
+      profile_notifications_.erase(old_id);
+      profile_notifications_[notification.notification_id()] =
+          new ProfileNotification(profile, notification);
+
+      message_center_->UpdateNotification(old_id,
+                                          notification.notification_id(),
+                                          notification.title(),
+                                          notification.body(),
+                                          notification.optional_fields());
+      notification.Display();
+      return true;
+    }
+  }
   return false;
 }
+
+////////////////////////////////////////////////////////////////////////////////
+// MessageCenter::Delegate
+
+void MessageCenterNotificationManager::DisableExtension(
+    const std::string& notification_id) {
+  NOTIMPLEMENTED();
+}
+
+void MessageCenterNotificationManager::DisableNotificationsFromSource(
+    const std::string& notification_id) {
+  NOTIMPLEMENTED();
+}
+
+void MessageCenterNotificationManager::NotificationRemoved(
+    const std::string& notification_id) {
+  NOTIMPLEMENTED();
+}
+
+void MessageCenterNotificationManager::ShowSettings(
+    const std::string& notification_id) {
+  NOTIMPLEMENTED();
+}
+
+void MessageCenterNotificationManager::OnClicked(
+    const std::string& notification_id) {
+  NOTIMPLEMENTED();
+}
+
+void MessageCenterNotificationManager::OnButtonClicked(
+    const std::string& notification_id, int button_index) {
+  NOTIMPLEMENTED();
+}
+
+////////////////////////////////////////////////////////////////////////////////
+// ProfileNotification
+
+MessageCenterNotificationManager::ProfileNotification::ProfileNotification(
+    Profile* profile, const Notification& notification)
+  : profile_(profile),
+    notification_(notification) {
+  DCHECK(profile);
+}
+
+std::string
+    MessageCenterNotificationManager::ProfileNotification::GetExtensionId() {
+  const ExtensionURLInfo url(notification().origin_url());
+  const ExtensionService* service = profile()->GetExtensionService();
+  const extensions::Extension* extension =
+      service->extensions()->GetExtensionOrAppByURL(url);
+  return extension ? extension->id() : std::string();
+}
+
+////////////////////////////////////////////////////////////////////////////////
+// private
+
+void MessageCenterNotificationManager::AddProfileNotification(
+    ProfileNotification* profile_notification) {
+  const Notification& notification = profile_notification->notification();
+  std::string id = notification.notification_id();
+  // 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.Display();
+}
+
+void MessageCenterNotificationManager::RemoveProfileNotification(
+    ProfileNotification* profile_notification) {
+  profile_notification->notification().Close(false); // Not by user.
+  std::string id = profile_notification->notification().notification_id();
+  message_center_->RemoveNotification(id);
+  profile_notifications_.erase(id);
+  delete profile_notification;
+}