Chromium Code Reviews| 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); |