diff options
| author | jennyz@chromium.org <jennyz@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2013-12-16 18:10:29 +0000 |
|---|---|---|
| committer | jennyz@chromium.org <jennyz@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2013-12-16 18:10:29 +0000 |
| commit | de27c6d3522b9884cd6517c5ce3d00e24ee3d928 (patch) | |
| tree | 46c709e2612f96a07116720240817c428005003d /ash | |
| parent | 641ad8b60a66d7f1da23acc417a777b24768af02 (diff) | |
| download | chromium_src-de27c6d3522b9884cd6517c5ce3d00e24ee3d928.zip chromium_src-de27c6d3522b9884cd6517c5ce3d00e24ee3d928.tar.gz chromium_src-de27c6d3522b9884cd6517c5ce3d00e24ee3d928.tar.bz2 | |
Disable the spring charger dialog on locked screen.
BUG=328449
R=xiyuan@chromium.org
Review URL: https://codereview.chromium.org/113303004
git-svn-id: svn://svn.chromium.org/chrome/trunk/src@240927 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'ash')
| -rw-r--r-- | ash/system/chromeos/power/tray_power.cc | 8 |
1 files changed, 7 insertions, 1 deletions
diff --git a/ash/system/chromeos/power/tray_power.cc b/ash/system/chromeos/power/tray_power.cc index 8bc68d5..9ab2e6f 100644 --- a/ash/system/chromeos/power/tray_power.cc +++ b/ash/system/chromeos/power/tray_power.cc @@ -168,7 +168,13 @@ void TrayPower::UpdateAfterShelfAlignmentChange(ShelfAlignment alignment) { void TrayPower::OnPowerStatusChanged() { RecordChargerType(); - if (PowerStatus::Get()->IsOriginalSpringChargerConnected()) { + // TODO(jennyz): Enable showing spring charger dialog on locked screen after + // crbug.com/328593 is fixed. + user::LoginStatus login_status = + Shell::GetInstance()->system_tray_delegate()->GetUserLoginStatus(); + if (PowerStatus::Get()->IsOriginalSpringChargerConnected() && + (login_status != user::LOGGED_IN_NONE && + login_status != user::LOGGED_IN_LOCKED)) { ash::Shell::GetInstance()->system_tray_delegate()-> ShowSpringChargerReplacementDialog(); } |