| 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..d3866685b17c4370a01327cf5ba243afdfe3efc4 100644
|
| --- a/ash/wm/power_button_controller.cc
|
| +++ b/ash/wm/power_button_controller.cc
|
| @@ -78,7 +78,7 @@ void PowerButtonController::OnPowerButtonEvent(
|
| // immediately.
|
| if (down) {
|
| if (session_state_delegate->CanLockScreen() &&
|
| - !session_state_delegate->IsScreenLocked() &&
|
| + !session_state_delegate->IsUserSessionBlocked() &&
|
| !controller_->LockRequested()) {
|
| controller_->StartLockAnimationAndLockImmediately(false);
|
| } else {
|
| @@ -92,7 +92,7 @@ void PowerButtonController::OnPowerButtonEvent(
|
| return;
|
|
|
| if (session_state_delegate->CanLockScreen() &&
|
| - !session_state_delegate->IsScreenLocked()) {
|
| + !session_state_delegate->IsUserSessionBlocked()) {
|
| if (Shell::GetInstance()->maximize_mode_controller()->
|
| IsMaximizeModeWindowManagerEnabled() && enable_quick_lock_)
|
| controller_->StartLockAnimationAndLockImmediately(true);
|
|
|