Revert 199625 "Remove ENABLE_MESSAGE_CENTER"

trunk/src/chrome/browser/notifications/desktop_notification_service.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/desktop_notification_service.h"
 
 #include "base/metrics/histogram.h"
 #include "base/threading/thread.h"
 #include "base/utf_string_conversions.h"
 #include "chrome/browser/browser_process.h"
@@ skipping 25 matching lines @@
 #include "content/public/common/show_desktop_notification_params.h"
 #include "extensions/common/constants.h"
 #include "grit/browser_resources.h"
 #include "grit/chromium_strings.h"
 #include "grit/generated_resources.h"
 #include "grit/theme_resources.h"
 #include "net/base/escape.h"
 #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"
 
 using content::BrowserThread;
 using content::RenderViewHost;
 using content::WebContents;
 using WebKit::WebNotificationPresenter;
 using WebKit::WebTextDirection;
 using WebKit::WebSecurityOrigin;
 
 const ContentSetting kDefaultSetting = CONTENT_SETTING_ASK;
 
 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);
   base::ListValue* const list = update.Get();
   if (flag) {
     // AppendIfNotPresent will delete |adding_value| when the same value
     // already exists.
     base::StringValue* const adding_value = new base::StringValue(item);
     list->AppendIfNotPresent(adding_value);
   } else {
@@ skipping 153 matching lines @@
   action_taken_ = true;
   return true;
 }
 
 
 // DesktopNotificationService -------------------------------------------------
 
 // 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
 string16 DesktopNotificationService::CreateDataUrl(
     const GURL& icon_url, const string16& title, const string16& body,
     WebTextDirection dir) {
   int resource;
   std::vector<std::string> subst;
   if (icon_url.is_valid()) {
     resource = IDR_NOTIFICATION_ICON_HTML;
@@ skipping 42 matching lines @@
 
 // static
 std::string DesktopNotificationService::AddNotification(
     const GURL& origin_url,
     const string16& title,
     const string16& message,
     const GURL& icon_url,
     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,
                               string16(), replace_id, delegate);
     g_browser_process->notification_ui_manager()->Add(notification, profile);
     return notification.notification_id();
   }
 
   // Generate a data URL embedding the icon URL, title, and message.
   GURL content_url(CreateDataUrl(
       icon_url, title, message, WebKit::WebTextDirectionDefault));
   Notification notification(
       GURL(), content_url, string16(), replace_id, delegate);
   g_browser_process->notification_ui_manager()->Add(notification, profile);
   return notification.notification_id();
 }
 
 // static
 std::string DesktopNotificationService::AddIconNotification(
     const GURL& origin_url,
     const string16& title,
     const string16& message,
     const gfx::Image& icon,
     const string16& replace_id,
     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,
                               string16(), replace_id, delegate);
     g_browser_process->notification_ui_manager()->Add(notification, profile);
     return notification.notification_id();
   }
 
   GURL icon_url;
   if (!icon.IsEmpty())
     icon_url = GURL(webui::GetBitmapDataUrl(*icon.ToSkBitmap()));
   return AddNotification(
       origin_url, title, message, icon_url, replace_id, delegate, profile);
 }
 
 // static
 void DesktopNotificationService::RemoveNotification(
     const std::string& notification_id) {
     g_browser_process->notification_ui_manager()->CancelById(notification_id);
 }
 
 DesktopNotificationService::DesktopNotificationService(
     Profile* profile,
     NotificationUIManager* ui_manager)
     : profile_(profile),
       ui_manager_(ui_manager) {
+#if defined(ENABLE_MESSAGE_CENTER)
   OnDisabledExtensionIdsChanged();
   OnDisabledSystemComponentIdsChanged();
   disabled_extension_id_pref_.Init(
       prefs::kMessageCenterDisabledExtensionIds,
       profile_->GetPrefs(),
       base::Bind(
           &DesktopNotificationService::OnDisabledExtensionIdsChanged,
           base::Unretained(this)));
   disabled_system_component_id_pref_.Init(
       prefs::kMessageCenterDisabledSystemComponentIds,
       profile_->GetPrefs(),
       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) {
   ContentSettingsPattern primary_pattern =
       ContentSettingsPattern::FromURLNoWildcard(origin);
   profile_->GetHostContentSettingsMap()->SetContentSetting(
       primary_pattern,
       ContentSettingsPattern::Wildcard(),
       CONTENT_SETTINGS_TYPE_NOTIFICATIONS,
       NO_RESOURCE_IDENTIFIER,
@@ skipping 188 matching lines @@
       id,
       !enabled);
 }
 
 void DesktopNotificationService::OnDisabledExtensionIdsChanged() {
   CopySetFromPrefToMemory(profile_->GetPrefs(),
                           prefs::kMessageCenterDisabledExtensionIds,
                           &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)) ==
          disabled_system_component_ids_.end();
 }
 
 void DesktopNotificationService::SetSystemComponentEnabled(
     message_center::Notifier::SystemComponentNotifierType type, bool enabled) {
   // Do not touch |disabled_extension_ids_|. It will be updated at
   // OnDisabledExtensionIdsChanged() which will be called when the pref changes.
   ToggleListPrefItem(
       profile_->GetPrefs(),
       prefs::kMessageCenterDisabledSystemComponentIds,
       message_center::ToString(type),
       !enabled);
 }
 
 void DesktopNotificationService::OnDisabledSystemComponentIdsChanged() {
   disabled_system_component_ids_.clear();
   CopySetFromPrefToMemory(profile_->GetPrefs(),
                           prefs::kMessageCenterDisabledSystemComponentIds,
                           &disabled_system_component_ids_);
 }
+#endif
 
 WebKit::WebNotificationPresenter::Permission
     DesktopNotificationService::HasPermission(const GURL& origin) {
   DCHECK(BrowserThread::CurrentlyOn(BrowserThread::IO));
   HostContentSettingsMap* host_content_settings_map =
       profile_->GetHostContentSettingsMap();
   ContentSetting setting = host_content_settings_map->GetContentSetting(
       origin,
       origin,
       CONTENT_SETTINGS_TYPE_NOTIFICATIONS,
       NO_RESOURCE_IDENTIFIER);
 
   if (setting == CONTENT_SETTING_ALLOW)
     return WebKit::WebNotificationPresenter::PermissionAllowed;
   if (setting == CONTENT_SETTING_BLOCK)
     return WebKit::WebNotificationPresenter::PermissionDenied;
   if (setting == CONTENT_SETTING_ASK)
     return WebKit::WebNotificationPresenter::PermissionNotAllowed;
   NOTREACHED() << "Invalid notifications settings value: " << setting;
   return WebKit::WebNotificationPresenter::PermissionNotAllowed;
 }