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

Unified Diff: ash/wm/power_button_controller.cc

Issue 11238058: Do not start autoshutdown on lock button press. (Closed) Base URL: http://git.chromium.org/chromium/src.git@master
Patch Set: Created 8 years, 2 months 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 | ash/wm/session_state_controller.h » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: ash/wm/power_button_controller.cc
diff --git a/ash/wm/power_button_controller.cc b/ash/wm/power_button_controller.cc
index f7bc2f3e2ebffafe60e466925addb2070bede79d..8b6c549e8e9006184b55c96ef487d5426625ebdb 100644
--- a/ash/wm/power_button_controller.cc
+++ b/ash/wm/power_button_controller.cc
@@ -62,7 +62,7 @@ void PowerButtonController::OnPowerButtonEvent(
return;
if (controller_->IsEligibleForLock())
- controller_->StartLockAnimation();
+ controller_->StartLockAnimation(true);
else
controller_->StartShutdownAnimation();
} else { // Button is up.
@@ -92,7 +92,7 @@ void PowerButtonController::OnLockButtonEvent(
return;
if (down)
- controller_->StartLockAnimation();
+ controller_->StartLockAnimation(false);
else
controller_->CancelLockWithOtherAnimation();
}
« no previous file with comments | « no previous file | ash/wm/session_state_controller.h » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698