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

Unified Diff: ash/wm/power_button_controller.cc

Issue 826483002: Condition added to prevent lock animation on Supervised User creation. (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: Created 6 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 | « ash/accelerators/accelerator_controller.cc ('k') | no next file » | 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 5a26a83cbf113911fd4fb23d6733e46ff880835d..5f2b932f2da2632e64d4187a0f0cbda3283d5b44 100644
--- a/ash/wm/power_button_controller.cc
+++ b/ash/wm/power_button_controller.cc
@@ -92,7 +92,8 @@ void PowerButtonController::OnPowerButtonEvent(
return;
if (session_state_delegate->CanLockScreen() &&
- !session_state_delegate->IsScreenLocked()) {
+ !session_state_delegate->IsScreenLocked() &&
dzhioev (left Google) 2014/12/23 14:08:52 IsScreenLocked() implies IsUserSessionBlocked(), s
+ !session_state_delegate->IsUserSessionBlocked()) {
if (Shell::GetInstance()->maximize_mode_controller()->
IsMaximizeModeWindowManagerEnabled() && enable_quick_lock_)
controller_->StartLockAnimationAndLockImmediately(true);
« no previous file with comments | « ash/accelerators/accelerator_controller.cc ('k') | no next file » | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698