diff options
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(); } |