Turn of ash notification tray by default for M21.

Note: since strings are froze, the text in about:flags will be incorrect.

BUG=134043
TEST=The ash notification tray should be disabled for normal and incognito/guest login.

Ash owners:
TBR=ben@chromium.org
Review URL: https://chromiumcodereview.appspot.com/10690031

git-svn-id: svn://svn.chromium.org/chrome/branches/1180/src@144940 0039d316-1c4b-4281-b951-d872f2087c98

6 files changed, 9 insertions, 11 deletions

diff --git a/chrome/browser/chromeos/extensions/file_browser_notifications.cc b/chrome/browser/chromeos/extensions/file_browser_notifications.cc
index 97800c0..f4f59df 100644
--- a/chrome/browser/chromeos/extensions/file_browser_notifications.cc
+++ b/chrome/browser/chromeos/extensions/file_browser_notifications.cc
@@ -135,8 +135,8 @@ class FileBrowserNotifications::NotificationMessage {
         type_(type),
         notification_id_(notification_id),
         message_(message) {
-    if (!CommandLine::ForCurrentProcess()->HasSwitch(
-            ash::switches::kAshNotifyDisabled)) {
+    if (CommandLine::ForCurrentProcess()->HasSwitch(
+            ash::switches::kAshNotify)) {
       const gfx::ImageSkia& icon =
           *ResourceBundle::GetSharedInstance().GetImageSkiaNamed(
               IDR_FILES_APP_ICON);
diff --git a/chrome/browser/chromeos/locale_change_guard.cc b/chrome/browser/chromeos/locale_change_guard.cc
index aa861e2..4ceb92b 100644
--- a/chrome/browser/chromeos/locale_change_guard.cc
+++ b/chrome/browser/chromeos/locale_change_guard.cc
@@ -173,8 +173,7 @@ void LocaleChangeGuard::Check() {
     PrepareChangingLocale(from_locale, to_locale);
   }
 
-  if (!CommandLine::ForCurrentProcess()->HasSwitch(
-          ash::switches::kAshNotifyDisabled)) {
+  if (CommandLine::ForCurrentProcess()->HasSwitch(ash::switches::kAshNotify)) {
     ash::Shell::GetInstance()->system_tray()->locale_observer()->
         OnLocaleChanged(this, cur_locale, from_locale_, to_locale_);
     return;
diff --git a/chrome/browser/chromeos/login/login_utils.cc b/chrome/browser/chromeos/login/login_utils.cc
index 1205749..38a1e34 100644
--- a/chrome/browser/chromeos/login/login_utils.cc
+++ b/chrome/browser/chromeos/login/login_utils.cc
@@ -753,7 +753,7 @@ std::string LoginUtilsImpl::GetOffTheRecordCommandLine(
       ash::switches::kAuraLegacyPowerButton,
       ash::switches::kAuraNoShadows,
       ash::switches::kAuraPanelManager,
-      ash::switches::kAshNotifyDisabled,
+      ash::switches::kAshNotify,
       ::switches::kUIEnablePartialSwap,
       ::switches::kUIPrioritizeInGpuProcess,
 #if defined(USE_CRAS)
diff --git a/chrome/browser/chromeos/network_message_observer.cc b/chrome/browser/chromeos/network_message_observer.cc
index 317f019..98b65ae 100644
--- a/chrome/browser/chromeos/network_message_observer.cc
+++ b/chrome/browser/chromeos/network_message_observer.cc
@@ -69,8 +69,8 @@ class NetworkMessageNotification : public ash::NetworkTrayDelegate {
         break;
     }
     DCHECK(!id.empty());
-    if (CommandLine::ForCurrentProcess()->HasSwitch(
-            ash::switches::kAshNotifyDisabled)) {
+    if (!CommandLine::ForCurrentProcess()->HasSwitch(
+            ash::switches::kAshNotify)) {
       system_notification_.reset(
           new SystemNotification(profile, id, icon_id, title_));
     }
diff --git a/chrome/browser/chromeos/profile_startup.cc b/chrome/browser/chromeos/profile_startup.cc
index ebe9103..4b1b5b7 100644
--- a/chrome/browser/chromeos/profile_startup.cc
+++ b/chrome/browser/chromeos/profile_startup.cc
@@ -33,8 +33,8 @@ void ProfileStartup(Profile* profile, bool process_startup) {
   if (process_startup) {
     // These observers are singletons. They are never deleted but the pointers
     // are kept in a statics so that they are not reported as leaks.
-    if (CommandLine::ForCurrentProcess()->HasSwitch(
-            ash::switches::kAshNotifyDisabled)) {
+    if (!CommandLine::ForCurrentProcess()->HasSwitch(
+            ash::switches::kAshNotify)) {
       static chromeos::LowBatteryObserver* low_battery_observer =
           new chromeos::LowBatteryObserver(profile);
       chromeos::DBusThreadManager::Get()->GetPowerManagerClient()->AddObserver(
diff --git a/chrome/browser/chromeos/sms_observer.cc b/chrome/browser/chromeos/sms_observer.cc
index fce8108..b03c4be 100644
--- a/chrome/browser/chromeos/sms_observer.cc
+++ b/chrome/browser/chromeos/sms_observer.cc
@@ -115,8 +115,7 @@ void SmsObserver::OnNewMessage(const char* modem_device_path,
   if (!*message->text)
     return;
 
-  if (CommandLine::ForCurrentProcess()->HasSwitch(
-          ash::switches::kAshNotifyDisabled)) {
+  if (!CommandLine::ForCurrentProcess()->HasSwitch(ash::switches::kAshNotify)) {
     SystemNotification note(
         profile_,
         "incoming _sms.chromeos",