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

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

Issue 116913002: Revert 240927 "Disable the spring charger dialog on locked screen." (Closed) Base URL: svn://svn.chromium.org/chrome/
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: trunk/src/ash/system/chromeos/power/tray_power.cc
===================================================================
--- trunk/src/ash/system/chromeos/power/tray_power.cc (revision 241085)
+++ trunk/src/ash/system/chromeos/power/tray_power.cc (working copy)
@@ -168,13 +168,7 @@
void TrayPower::OnPowerStatusChanged() {
RecordChargerType();
- // 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)) {
+ if (PowerStatus::Get()->IsOriginalSpringChargerConnected()) {
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