Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(191)

Unified Diff: ash/system/chromeos/power/tray_power.cc

Issue 113303004: Disable the spring charger dialog on locked screen. (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: Created 7 years ago
Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.
Jump to:
View side-by-side diff with in-line comments
Download patch
« no previous file with comments | « no previous file | no next file » | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: ash/system/chromeos/power/tray_power.cc
diff --git a/ash/system/chromeos/power/tray_power.cc b/ash/system/chromeos/power/tray_power.cc
index 8bc68d5ec4e9506a16076a88bd6447baf4275d84..9ab2e6fb2672cf347c087235b659be73d9acc560 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();
}
« no previous file with comments | « no previous file | no next file » | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698