Rename aura-notify ash-notify and add to about_flags.

BUG=124269 TEST=Enable ash-notify in chrome://flags and ensure that ash system notifications for low batter appear instead of desktop notifications TBR=ben for ash/ Review URL: https://chromiumcodereview.appspot.com/10406010 git-svn-id: svn://svn.chromium.org/chrome/trunk/src@137465 0039d316-1c4b-4281-b951-d872f2087c98
280723148 · May 16, 2012 · 817ecd1 · 817ecd1
1 parent 52bd781
commit 817ecd1
Show file tree

Hide file tree

Showing 6 changed files with 19 additions and 6 deletions.
diff --git a/ash/ash_switches.cc b/ash/ash_switches.cc
@@ -10,6 +10,9 @@ namespace switches {
 // Enables the Oak tree viewer.
 const char kAshEnableOak[] = "ash-enable-oak";
 
+// Use Ash notifications.
+const char kAshNotify[] = "ash-notify";
+
 // Use Google-style dialog box frames.
 const char kAuraGoogleDialogFrames[] = "aura-google-dialog-frames";
 
@@ -22,9 +25,6 @@ const char kAuraLegacyPowerButton[] = "aura-legacy-power-button";
 // Avoid drawing drop shadows under windows.
 const char kAuraNoShadows[] = "aura-no-shadows";
 
-// Use Aura notifications.
-const char kAuraNotify[] = "aura-notify";
-
 // Use Aura to manage windows of type WINDOW_TYPE_PANEL.
 const char kAuraPanelManager[] = "aura-panels";
 

diff --git a/ash/ash_switches.h b/ash/ash_switches.h
@@ -17,10 +17,10 @@ namespace switches {
 
 // Please keep alphabetized.
 ASH_EXPORT extern const char kAshEnableOak[];
+ASH_EXPORT extern const char kAshNotify[];
 ASH_EXPORT extern const char kAuraGoogleDialogFrames[];
 ASH_EXPORT extern const char kAuraLegacyPowerButton[];
 ASH_EXPORT extern const char kAuraNoShadows[];
-ASH_EXPORT extern const char kAuraNotify[];
 ASH_EXPORT extern const char kAuraPanelManager[];
 ASH_EXPORT extern const char kAuraWindowAnimationsDisabled[];
 ASH_EXPORT extern const char kEnableAppListV2[];

diff --git a/ash/system/power/tray_power.cc b/ash/system/power/tray_power.cc
@@ -374,7 +374,7 @@ void TrayPower::OnPowerStatusChanged(const PowerSupplyStatus& status) {
   if (notification_view_)
     notification_view_->UpdatePowerStatus(status);
 
-  if (CommandLine::ForCurrentProcess()->HasSwitch(switches::kAuraNotify)) {
+  if (CommandLine::ForCurrentProcess()->HasSwitch(switches::kAshNotify)) {
     if (UpdateNotificationState(status))
       ShowNotificationView();
     else if (notification_state_ == NOTIFICATION_NONE)

diff --git a/chrome/app/generated_resources.grd b/chrome/app/generated_resources.grd
@@ -5655,6 +5655,12 @@ Keep your key file in a safe place. You will need it to create new versions of y
       <message name="IDS_FLAGS_ENABLE_APPLIST_V2_DESCRIPTION" desc="Description of the flag to enable applist v2 in ash.">
         Enables the bubble-style applist v2.
       </message>
+      <message name="IDS_FLAGS_ENABLE_ASH_NOTIFY_NAME" desc="Name of the flag to enable applist v2 in ash.">
+        Enable Ash notifications.
+      </message>
+      <message name="IDS_FLAGS_ENABLE_ASH_NOTIFY_DESCRIPTION" desc="Description of the flag to enable applist v2 in ash.">
+        Enables ash status tray notifications instead of desktop system notifications.
+      </message>
 
       <if expr="pp_ifdef('chromeos')">
         <message name="IDS_FLAGS_ALLOW_TOUCHPAD_THREE_FINGER_CLICK_NAME" desc="Name for the flag to enable touchpad three finger click as middle button.">

diff --git a/chrome/browser/about_flags.cc b/chrome/browser/about_flags.cc
@@ -724,6 +724,13 @@ const Experiment kExperiments[] = {
     kOsAll,
     SINGLE_VALUE_TYPE(switches::kShowLauncherAlignmentMenu)
   },
+  {
+    "ash-notify",
+    IDS_FLAGS_ENABLE_ASH_NOTIFY_NAME,
+    IDS_FLAGS_ENABLE_ASH_NOTIFY_DESCRIPTION,
+    kOsAll,
+    SINGLE_VALUE_TYPE(ash::switches::kAshNotify),
+  },
 #endif
 };
 

diff --git a/chrome/browser/chromeos/profile_startup.cc b/chrome/browser/chromeos/profile_startup.cc
@@ -34,7 +34,7 @@ void ProfileStartup(Profile* profile, bool 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::kAuraNotify)) {
+            ash::switches::kAshNotify)) {
       static chromeos::LowBatteryObserver* low_battery_observer =
           new chromeos::LowBatteryObserver(profile);
       chromeos::DBusThreadManager::Get()->GetPowerManagerClient()->AddObserver(