Start delegating notifications to MessageCenter on Windows.

chrome/browser/notifications/notification_ui_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/notification_ui_manager.h"
 
 #include "base/command_line.h"
 #include "chrome/browser/notifications/balloon_notification_ui_manager.h"
 #include "chrome/common/chrome_switches.h"
 
 #if defined(ENABLE_MESSAGE_CENTER)
 #include "chrome/browser/notifications/message_center_notification_manager.h"
+
+// MessageCenter either lives in ash::Shell (with USE_ASH), or in
+// BrowserProcess for non-ash builds. It has to be in ash::Shell since UI
+// elements of Shell that show notifications use it.
+#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
+}
+}
+#endif // defined(ENABLE_MESSAGE_CENTER)
+
 // static
 bool NotificationUIManager::DelegatesToMessageCenter() {
-#if defined(ENABLE_MESSAGE_CENTER)
   return CommandLine::ForCurrentProcess()->HasSwitch(
       switches::kEnableRichNotifications);
-#else
   return false;
-#endif
 }
 
 #if !defined(OS_MACOSX)
 // static
 NotificationUIManager* NotificationUIManager::Create(PrefService* local_state) {
 #if defined(ENABLE_MESSAGE_CENTER)
   if (DelegatesToMessageCenter())
-    return new MessageCenterNotificationManager();
+    return new MessageCenterNotificationManager(GetMessageCenterInstance());
 #endif
   BalloonNotificationUIManager* balloon_manager =
       new BalloonNotificationUIManager(local_state);
   balloon_manager->SetBalloonCollection(BalloonCollection::Create());
   return balloon_manager;
 }
 #endif