Turn of ash notification tray by default for M21.

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
Committed: https://src.chromium.org/viewvc/chrome?view=rev&revision=144940

[oshima, 2012-06-28 23:33:14]

lgtm

On Thu, Jun 28, 2012 at 4:30 PM, <stevenjb@chromium.org> wrote:

> Reviewers: oshima, kuscher_chromium.org,
>
> Description:
> 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.
>
> Please review this at
http://codereview.chromium.**org/10690031/<http://codereview.chromium.org/106...
>
> SVN Base:
svn://svn.chromium.org/chrome/**branches/1180/src/<http://svn.chromium.org/chrome/branches/1180/src/>
>
> Affected files:
>  M     ash/ash_switches.h
>  M     ash/ash_switches.cc
>  M     ash/system/power/tray_power.cc
>  M     chrome/browser/about_flags.cc
>  M     chrome/browser/chromeos/**extensions/file_browser_**
> notifications.cc
>  M     chrome/browser/chromeos/**locale_change_guard.cc
>  M     chrome/browser/chromeos/login/**login_utils.cc
>  M     chrome/browser/chromeos/**network_message_observer.cc
>  M     chrome/browser/chromeos/**profile_startup.cc
>  M     chrome/browser/chromeos/sms_**observer.cc
>  M     chrome/browser/notifications/**desktop_notification_service.**cc
>  M     chrome/browser/ui/views/ash/**balloon_collection_impl_ash.cc
>
>
> Index: ash/ash_switches.cc
> ==============================**==============================**=======
> --- ash/ash_switches.cc (revision 144827)
> +++ ash/ash_switches.cc (working copy)
> @@ -17,8 +17,8 @@
>  // Enable extended desktop.
>  const char kAshExtendedDesktop[] = "ash-extended-desktop";
>
> -// Disable using Ash notifications.
> -const char kAshNotifyDisabled[] = "ash-notify-disabled";
> +// Use Ash notifications.
> +const char kAshNotify[] = "ash-notify";
>
>  // Enables the heads-up display for tracking touch points.
>  const char kAshTouchHud[] = "ash-touch-hud";
> Index: ash/ash_switches.h
> ==============================**==============================**=======
> --- ash/ash_switches.h  (revision 144827)
> +++ ash/ash_switches.h  (working copy)
> @@ -19,7 +19,7 @@
>  ASH_EXPORT extern const char kAppListShowAppsOnly[];
>  ASH_EXPORT extern const char kAshEnableOak[];
>  ASH_EXPORT extern const char kAshExtendedDesktop[];
> -ASH_EXPORT extern const char kAshNotifyDisabled[];
> +ASH_EXPORT extern const char kAshNotify[];
>  ASH_EXPORT extern const char kAshTouchHud[];
>  ASH_EXPORT extern const char kAshWindowAnimationsDisabled[]**;
>  ASH_EXPORT extern const char kAuraGoogleDialogFrames[];
> Index: ash/system/power/tray_power.cc
> ==============================**==============================**=======
> --- ash/system/power/tray_power.cc      (revision 144827)
> +++ ash/system/power/tray_power.cc      (working copy)
> @@ -210,8 +210,7 @@
>   if (notification_view_)
>     notification_view_->**UpdatePowerStatus(status);
>
> -  if (!CommandLine::**ForCurrentProcess()->**HasSwitch(
> -          switches::kAshNotifyDisabled)) {
> +  if
(CommandLine::**ForCurrentProcess()->**HasSwitch(switches::**kAshNotify))
> {
>     if (UpdateNotificationState(**status))
>       ShowNotificationView();
>     else if (notification_state_ == NOTIFICATION_NONE)
> Index: chrome/browser/about_flags.cc
> ==============================**==============================**=======
> --- chrome/browser/about_flags.cc       (revision 144827)
> +++ chrome/browser/about_flags.cc       (working copy)
> @@ -751,11 +751,11 @@
>     SINGLE_VALUE_TYPE(ash::**switches::kAshTouchHud)
>   },
>   {
> -    "ash-notify-disabled",
> +    "ash-notify",
>     IDS_FLAGS_DISABLE_ASH_NOTIFY_**NAME,
>     IDS_FLAGS_DISABLE_ASH_NOTIFY_**DESCRIPTION,
>     kOsAll,
> -    SINGLE_VALUE_TYPE(ash::**switches::kAshNotifyDisabled),
> +    SINGLE_VALUE_TYPE(ash::**switches::kAshNotify),
>   },
>   {
>     "enable-pinch",
> Index: chrome/browser/chromeos/**extensions/file_browser_**
> notifications.cc
> ==============================**==============================**=======
> --- chrome/browser/chromeos/**extensions/file_browser_**notifications.cc
>    (revision 144827)
> +++ chrome/browser/chromeos/**extensions/file_browser_**notifications.cc
>    (working copy)
> @@ -135,8 +135,8 @@
>         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);
> Index: chrome/browser/chromeos/**locale_change_guard.cc
> ==============================**==============================**=======
> --- chrome/browser/chromeos/**locale_change_guard.cc      (revision
> 144827)
> +++ chrome/browser/chromeos/**locale_change_guard.cc      (working copy)
> @@ -173,8 +173,7 @@
>     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;
> Index: chrome/browser/chromeos/login/**login_utils.cc
> ==============================**==============================**=======
> --- chrome/browser/chromeos/login/**login_utils.cc        (revision
> 144827)
> +++ chrome/browser/chromeos/login/**login_utils.cc        (working copy)
> @@ -753,7 +753,7 @@
>       ash::switches::**kAuraLegacyPowerButton,
>       ash::switches::kAuraNoShadows,
>       ash::switches::**kAuraPanelManager,
> -      ash::switches::**kAshNotifyDisabled,
> +      ash::switches::kAshNotify,
>       ::switches::**kUIEnablePartialSwap,
>       ::switches::**kUIPrioritizeInGpuProcess,
>  #if defined(USE_CRAS)
> Index: chrome/browser/chromeos/**network_message_observer.cc
> ==============================**==============================**=======
> --- chrome/browser/chromeos/**network_message_observer.cc (revision
> 144827)
> +++ chrome/browser/chromeos/**network_message_observer.cc (working copy)
> @@ -69,8 +69,8 @@
>         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_));
>     }
> Index: chrome/browser/chromeos/**profile_startup.cc
> ==============================**==============================**=======
> --- chrome/browser/chromeos/**profile_startup.cc  (revision 144827)
> +++ chrome/browser/chromeos/**profile_startup.cc  (working copy)
> @@ -33,8 +33,8 @@
>   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(
> Index: chrome/browser/chromeos/sms_**observer.cc
> ==============================**==============================**=======
> --- chrome/browser/chromeos/sms_**observer.cc     (revision 144827)
> +++ chrome/browser/chromeos/sms_**observer.cc     (working copy)
> @@ -115,8 +115,7 @@
>   if (!*message->text)
>     return;
>
> -  if (CommandLine::**ForCurrentProcess()->**HasSwitch(
> -          ash::switches::**kAshNotifyDisabled)) {
> +  if
(!CommandLine::**ForCurrentProcess()->**HasSwitch(ash::switches::**kAshNotify))
> {
>     SystemNotification note(
>         profile_,
>         "incoming _sms.chromeos",
> Index: chrome/browser/notifications/**desktop_notification_service.**cc
> ==============================**==============================**=======
> --- chrome/browser/notifications/**desktop_notification_service.**cc
>    (revision 144827)
> +++ chrome/browser/notifications/**desktop_notification_service.**cc
>    (working copy)
> @@ -52,8 +52,7 @@
>  namespace {
>
>  bool IsAshNotifyEnabled() {
> -  return !CommandLine::**ForCurrentProcess()->**HasSwitch(
> -      ash::switches::**kAshNotifyDisabled);
> +  return CommandLine::**ForCurrentProcess()->**HasSwitch(ash::switches::*
> *kAshNotify);
>  }
>
>  }  // namespace
> Index: chrome/browser/ui/views/ash/**balloon_collection_impl_ash.cc
> ==============================**==============================**=======
> --- chrome/browser/ui/views/ash/**balloon_collection_impl_ash.cc
>  (revision 144827)
> +++ chrome/browser/ui/views/ash/**balloon_collection_impl_ash.cc
>  (working copy)
> @@ -22,8 +22,7 @@
>  namespace {
>
>  bool IsAshNotifyEnabled() {
> -  return !CommandLine::**ForCurrentProcess()->**HasSwitch(
> -      ash::switches::**kAshNotifyDisabled);
> +  return CommandLine::**ForCurrentProcess()->**HasSwitch(ash::switches::*
> *kAshNotify);
>  }
>
>  }  // namespace
>
>
>