Chromium Code Reviews| Index: ash/session/session_controller.cc |
| diff --git a/ash/session/session_controller.cc b/ash/session/session_controller.cc |
| index 82f5a6c5cf8c11c88a73f778c1082481080a501a..24c01d194f328af19a2c4b63fe44f6b289d59f50 100644 |
| --- a/ash/session/session_controller.cc |
| +++ b/ash/session/session_controller.cc |
| @@ -82,13 +82,18 @@ bool SessionController::ShouldLockScreenAutomatically() const { |
| } |
| bool SessionController::IsUserSessionBlocked() const { |
| - // User sessions are blocked when session state is not ACTIVE, except that |
| - // LOCKED state with a running unlocking animation. This is made an exception |
| - // because the unlocking animation hides lock container at the end. During the |
| - // unlock animation, IsUserSessionBlocked needs to return unblocked so that |
| - // user windows are deemed activatable and ash correctly restore the active |
| - // window before locking. |
| + // User sessions are blocked when session state is not ACTIVE, with two |
| + // exceptions: |
| + // - LOGGED_IN_NOT_ACTIVE state. This is needed so that browser windows |
| + // created by session restore (or a default new browser window) is properly |
|
The one and only Dr. Crash
2017/05/24 23:12:09
Plural ("are") since you're talking about multiple
xiyuan
2017/05/25 14:31:48
Done.
|
| + // activated before session state changes to ACTIVE. |
| + // - LOCKED state with a running unlocking animation. This is needed because |
| + // the unlocking animation hides lock container at the end. During the |
|
The one and only Dr. Crash
2017/05/24 23:12:08
the lock
xiyuan
2017/05/25 14:31:48
Done.
|
| + // unlock animation, IsUserSessionBlocked needs to return unblocked so that |
| + // user windows are deemed activatable and ash correctly restore the active |
|
The one and only Dr. Crash
2017/05/24 23:12:08
restores
xiyuan
2017/05/25 14:31:48
Done.
|
| + // window before locking. |
| return state_ != SessionState::ACTIVE && |
| + state_ != SessionState::LOGGED_IN_NOT_ACTIVE && |
| !(state_ == SessionState::LOCKED && is_unlocking_); |
| } |