Turn of ash notification tray by default for M21.

chrome/browser/chromeos/sms_observer.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/chromeos/sms_observer.h"
 
 #include "ash/ash_switches.h"
 #include "ash/shell.h"
 #include "ash/system/network/sms_observer.h"
 #include "ash/system/tray/system_tray.h"
@@ skipping 97 matching lines @@
           << " text: " << message->text;
 
   // Don't show empty messages. Such messages most probably "Message Waiting
   // Indication" and it should be determined by data-coding-scheme,
   // see crosbug.com/27883. But this field is not exposed from libcros.
   // TODO(dpokuhin): when libcros refactoring done, implement check for
   // "Message Waiting Indication" to filter out such messages.
   if (!*message->text)
     return;
 
-  if (CommandLine::ForCurrentProcess()->HasSwitch(
-          ash::switches::kAshNotifyDisabled)) {
+  if (!CommandLine::ForCurrentProcess()->HasSwitch(ash::switches::kAshNotify)) {
     SystemNotification note(
         profile_,
         "incoming _sms.chromeos",
         IDR_NOTIFICATION_SMS,
         l10n_util::GetStringFUTF16(
             IDS_SMS_NOTIFICATION_TITLE, UTF8ToUTF16(message->number)));
 
     note.Show(UTF8ToUTF16(message->text), true, false);
     return;
   }
 
   // Add an Ash SMS notification. TODO(stevenjb): Replace this code with
   // NetworkSmsHandler when fixed: crbug.com/133416.
   base::DictionaryValue dict;
   dict.SetString(ash::kSmsNumberKey, message->number);
   dict.SetString(ash::kSmsTextKey, message->text);
   ash::Shell::GetInstance()->system_tray()->sms_observer()->AddMessage(dict);
 }
 
 }  // namespace chromeos