Revert 199625 "Remove ENABLE_MESSAGE_CENTER"

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

Index: trunk/src/chrome/browser/notifications/desktop_notification_service.cc
===================================================================
--- trunk/src/chrome/browser/notifications/desktop_notification_service.cc	(revision 199638)
+++ trunk/src/chrome/browser/notifications/desktop_notification_service.cc	(working copy)
@@ -43,7 +43,6 @@
 #include "third_party/WebKit/Source/WebKit/chromium/public/WebSecurityOrigin.h"
 #include "ui/base/l10n/l10n_util.h"
 #include "ui/base/resource/resource_bundle.h"
-#include "ui/message_center/message_center_util.h"
 #include "ui/message_center/notifier_settings.h"
 #include "ui/webui/web_ui_util.h"
 
@@ -58,6 +57,15 @@
 
 namespace {
 
+bool UsesTextNotifications() {
+#if defined(USE_ASH)
+  return true;
+#else
+  return
+      g_browser_process->notification_ui_manager()->DelegatesToMessageCenter();
+#endif
+}
+
 void ToggleListPrefItem(PrefService* prefs, const char* key,
                         const std::string& item, bool flag) {
   ListPrefUpdate update(prefs, key);
@@ -231,10 +239,12 @@
 // static
 void DesktopNotificationService::RegisterUserPrefs(
     user_prefs::PrefRegistrySyncable* registry) {
+#if defined(OS_CHROMEOS) || defined(ENABLE_MESSAGE_CENTER)
   registry->RegisterListPref(prefs::kMessageCenterDisabledExtensionIds,
                              user_prefs::PrefRegistrySyncable::SYNCABLE_PREF);
   registry->RegisterListPref(prefs::kMessageCenterDisabledSystemComponentIds,
                              user_prefs::PrefRegistrySyncable::SYNCABLE_PREF);
+#endif
 }
 
 // static
@@ -297,7 +307,7 @@
     const string16& replace_id,
     NotificationDelegate* delegate,
     Profile* profile) {
-  if (message_center::IsRichNotificationEnabled()) {
+  if (UsesTextNotifications()) {
     // For message center create a non-HTML notification with |icon_url|.
     Notification notification(origin_url, icon_url, title, message,
                               WebKit::WebTextDirectionDefault,
@@ -325,7 +335,7 @@
     NotificationDelegate* delegate,
     Profile* profile) {
 
-  if (message_center::IsRichNotificationEnabled()) {
+  if (UsesTextNotifications()) {
     // For message center create a non-HTML notification with |icon|.
     Notification notification(origin_url, icon, title, message,
                               WebKit::WebTextDirectionDefault,
@@ -352,6 +362,7 @@
     NotificationUIManager* ui_manager)
     : profile_(profile),
       ui_manager_(ui_manager) {
+#if defined(ENABLE_MESSAGE_CENTER)
   OnDisabledExtensionIdsChanged();
   OnDisabledSystemComponentIdsChanged();
   disabled_extension_id_pref_.Init(
@@ -366,9 +377,13 @@
       base::Bind(
           &DesktopNotificationService::OnDisabledSystemComponentIdsChanged,
           base::Unretained(this)));
+#endif
 }
 
 DesktopNotificationService::~DesktopNotificationService() {
+#if defined(ENABLE_MESSAGE_CENTER)
+  disabled_extension_id_pref_.Destroy();
+#endif
 }
 
 void DesktopNotificationService::GrantPermission(const GURL& origin) {
@@ -577,6 +592,7 @@
                           &disabled_extension_ids_);
 }
 
+#if defined(ENABLE_MESSAGE_CENTER)
 bool DesktopNotificationService::IsSystemComponentEnabled(
     message_center::Notifier::SystemComponentNotifierType type) {
   return disabled_system_component_ids_.find(message_center::ToString(type)) ==
@@ -600,6 +616,7 @@
                           prefs::kMessageCenterDisabledSystemComponentIds,
                           &disabled_system_component_ids_);
 }
+#endif
 
 WebKit::WebNotificationPresenter::Permission
     DesktopNotificationService::HasPermission(const GURL& origin) {