Eliminate kAshNotifyDisabled and SystemNotification

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/api/infobars/confirm_infobar_delegate.h"
@@ skipping 26 matching lines @@
 #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/layout.h"
 #include "ui/base/resource/resource_bundle.h"
 
-#if defined(USE_ASH)
-#include "ash/ash_switches.h"
-#include "base/command_line.h"
-
-namespace {
-
-bool IsAshNotifyEnabled() {
-  return !CommandLine::ForCurrentProcess()->HasSwitch(
-      ash::switches::kAshNotifyDisabled);
-}
-
-}  // namespace
-#endif
-
 using content::BrowserThread;
 using content::RenderViewHost;
 using content::WebContents;
 using WebKit::WebNotificationPresenter;
 using WebKit::WebTextDirection;
 using WebKit::WebSecurityOrigin;
 
 const ContentSetting kDefaultSetting = CONTENT_SETTING_ASK;
 
 // NotificationPermissionInfoBarDelegate --------------------------------------
@@ skipping 164 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 defined(USE_ASH)
-  if (IsAshNotifyEnabled()) {
-    // For Ash create a non-HTML notification with |icon_url|.
-    Notification notification(GURL(), icon_url, title, message,
-                              WebKit::WebTextDirectionDefault,
-                              string16(), replace_id, delegate);
-    g_browser_process->notification_ui_manager()->Add(notification, profile);
-    return notification.notification_id();
-  }
-#endif
+  // For Ash create a non-HTML notification with |icon_url|.
+  Notification notification(GURL(), icon_url, title, message,
+                            WebKit::WebTextDirectionDefault,
+                            string16(), replace_id, delegate);
+  g_browser_process->notification_ui_manager()->Add(notification, profile);
+  return notification.notification_id();
+#else
   // 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();
+#endif
 }
 
 // static
 std::string DesktopNotificationService::AddIconNotification(
     const GURL& origin_url,
     const string16& title,
     const string16& message,
     const gfx::ImageSkia& icon,
     const string16& replace_id,
     NotificationDelegate* delegate,
     Profile* profile) {
 #if defined(USE_ASH)
-  if (IsAshNotifyEnabled()) {
-    // For Ash create a non-HTML notification with |icon|.
-    Notification notification(GURL(), icon, title, message,
-                              WebKit::WebTextDirectionDefault,
-                              string16(), replace_id, delegate);
-    g_browser_process->notification_ui_manager()->Add(notification, profile);
-    return notification.notification_id();
-  }
-#endif
+  // For Ash create a non-HTML notification with |icon|.
+  Notification notification(GURL(), icon, title, message,
+                            WebKit::WebTextDirectionDefault,
+                            string16(), replace_id, delegate);
+  g_browser_process->notification_ui_manager()->Add(notification, profile);
+  return notification.notification_id();
+#else
   GURL icon_url;
   if (!icon.isNull())
     icon_url = GURL(web_ui_util::GetImageDataUrl(icon));
   return AddNotification(
       origin_url, title, message, icon_url, replace_id, delegate, profile);
+#endif
 }
 
 // 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)
@@ skipping 229 matching lines @@
 
   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;
 }