Revert 199625 "Remove ENABLE_MESSAGE_CENTER"

trunk/src/chrome/browser/notifications/notification_ui_manager.cc

Index: trunk/src/chrome/browser/notifications/notification_ui_manager.cc
===================================================================
--- trunk/src/chrome/browser/notifications/notification_ui_manager.cc	(revision 199638)
+++ trunk/src/chrome/browser/notifications/notification_ui_manager.cc	(working copy)
@@ -4,10 +4,13 @@
 
 #include "chrome/browser/notifications/notification_ui_manager.h"
 
+#include "chrome/browser/notifications/balloon_notification_ui_manager.h"
+
+#if defined(ENABLE_MESSAGE_CENTER)
 #include "chrome/browser/browser_process.h"
-#include "chrome/browser/notifications/balloon_notification_ui_manager.h"
 #include "chrome/browser/notifications/message_center_notification_manager.h"
 #include "ui/message_center/message_center_util.h"
+#endif
 
 // static
 bool NotificationUIManager::DelegatesToMessageCenter() {
@@ -16,17 +19,20 @@
   // the message center.
 #if defined(OS_CHROMEOS)
   return true;
+#elif defined(ENABLE_MESSAGE_CENTER)
+  return message_center::IsRichNotificationEnabled();
 #endif
-  return message_center::IsRichNotificationEnabled();
+  return false;
 }
 
 #if !defined(OS_MACOSX)
 // static
 NotificationUIManager* NotificationUIManager::Create(PrefService* local_state) {
+#if defined(ENABLE_MESSAGE_CENTER)
   if (DelegatesToMessageCenter())
     return new MessageCenterNotificationManager(
         g_browser_process->message_center());
-
+#endif
   BalloonNotificationUIManager* balloon_manager =
       new BalloonNotificationUIManager(local_state);
   balloon_manager->SetBalloonCollection(BalloonCollection::Create());