diff options
| author | stevenjb@google.com <stevenjb@google.com@0039d316-1c4b-4281-b951-d872f2087c98> | 2012-06-18 16:20:46 +0000 |
|---|---|---|
| committer | stevenjb@google.com <stevenjb@google.com@0039d316-1c4b-4281-b951-d872f2087c98> | 2012-06-18 16:20:46 +0000 |
| commit | e154db37450561942285e2cdb00adce0171e15aa (patch) | |
| tree | 45834210e85bbe4bf52b06e9bc95014736f977f6 /ash | |
| parent | c6d4bc432dfd552f842b5288e44514e4c23385b9 (diff) | |
| download | chromium_src-e154db37450561942285e2cdb00adce0171e15aa.zip chromium_src-e154db37450561942285e2cdb00adce0171e15aa.tar.gz chromium_src-e154db37450561942285e2cdb00adce0171e15aa.tar.bz2 | |
Change kAshNotify to kAshNotifyDisabled (default ash notifications to enabled)
BUG=124914
TEST=Ash notifications should be enabled by default, can be disabled with --ash-notify-disabled
TBR=sadrul@chormium.org
Review URL: https://chromiumcodereview.appspot.com/10540168
git-svn-id: svn://svn.chromium.org/chrome/trunk/src@142730 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'ash')
| -rw-r--r-- | ash/ash_switches.cc | 4 | ||||
| -rw-r--r-- | ash/ash_switches.h | 2 | ||||
| -rw-r--r-- | ash/system/network/tray_sms.cc | 3 | ||||
| -rw-r--r-- | ash/system/power/tray_power.cc | 3 |
4 files changed, 7 insertions, 5 deletions
diff --git a/ash/ash_switches.cc b/ash/ash_switches.cc index b34f135..523549e 100644 --- a/ash/ash_switches.cc +++ b/ash/ash_switches.cc @@ -17,8 +17,8 @@ const char kAshEnableOak[] = "ash-enable-oak"; // Enable extended desktop. const char kAshExtendedDesktop[] = "ash-extended-desktop"; -// Use Ash notifications. -const char kAshNotify[] = "ash-notify"; +// Disable using Ash notifications. +const char kAshNotifyDisabled[] = "ash-notify-disabled"; // Enables the heads-up display for tracking touch points. const char kAshTouchHud[] = "ash-touch-hud"; diff --git a/ash/ash_switches.h b/ash/ash_switches.h index 2b4896e..8ebd479 100644 --- a/ash/ash_switches.h +++ b/ash/ash_switches.h @@ -19,7 +19,7 @@ namespace switches { ASH_EXPORT extern const char kAppListShowAppsOnly[]; ASH_EXPORT extern const char kAshEnableOak[]; ASH_EXPORT extern const char kAshExtendedDesktop[]; -ASH_EXPORT extern const char kAshNotify[]; +ASH_EXPORT extern const char kAshNotifyDisabled[]; ASH_EXPORT extern const char kAshTouchHud[]; ASH_EXPORT extern const char kAshWindowAnimationsDisabled[]; ASH_EXPORT extern const char kAuraGoogleDialogFrames[]; diff --git a/ash/system/network/tray_sms.cc b/ash/system/network/tray_sms.cc index 49fa1ee..073b65a 100644 --- a/ash/system/network/tray_sms.cc +++ b/ash/system/network/tray_sms.cc @@ -79,7 +79,8 @@ class TraySms::SmsObserver : public SmsObserverBase, public chromeos::NetworkSmsHandler::Observer { public: explicit SmsObserver(TraySms* tray) : SmsObserverBase(tray) { - if (!CommandLine::ForCurrentProcess()->HasSwitch(switches::kAshNotify)) + if (CommandLine::ForCurrentProcess()->HasSwitch( + switches::kAshNotifyDisabled)) return; sms_handler_.reset(new chromeos::NetworkSmsHandler()); sms_handler_->AddObserver(this); diff --git a/ash/system/power/tray_power.cc b/ash/system/power/tray_power.cc index 6a8d07c..b8c8e457 100644 --- a/ash/system/power/tray_power.cc +++ b/ash/system/power/tray_power.cc @@ -210,7 +210,8 @@ void TrayPower::OnPowerStatusChanged(const PowerSupplyStatus& status) { if (notification_view_) notification_view_->UpdatePowerStatus(status); - if (CommandLine::ForCurrentProcess()->HasSwitch(switches::kAshNotify)) { + if (!CommandLine::ForCurrentProcess()->HasSwitch( + switches::kAshNotifyDisabled)) { if (UpdateNotificationState(status)) ShowNotificationView(); else if (notification_state_ == NOTIFICATION_NONE) |