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

Issues Search
    My Issues | Starred     Open | Closed | All

Unified Diff: ash/wm/power_button_controller.cc

Issue 11230050: ash : introduce second SessionStateController implementation. (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 | « ash/shell.cc ('k') | ash/wm/power_button_controller_unittest.cc » ('j') | ash/wm/power_button_controller_unittest.cc » ('J')
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..8195200a5d3d7c9c782c03ade88e12d780c195c6 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,9 +92,9 @@ void PowerButtonController::OnLockButtonEvent(
return;
if (down)
- controller_->StartLockAnimation();
+ controller_->StartLockAnimation(false);
else
- controller_->CancelLockWithOtherAnimation();
+ controller_->CancelLockAnimation();
}
} // namespace ash
« no previous file with comments | « ash/shell.cc ('k') | ash/wm/power_button_controller_unittest.cc » ('j') | ash/wm/power_button_controller_unittest.cc » ('J')

Powered by Google App Engine
This is Rietveld 408576698