Merge "cros: Move wallpaper after login screen is gone"

ash/session/session_controller.cc

 // Copyright 2016 The Chromium Authors. All rights reserved.
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
 #include "ash/session/session_controller.h"
 
 #include <algorithm>
 
 #include "ash/session/session_state_observer.h"
 #include "ash/shell.h"
@@ skipping 60 matching lines @@
 
 bool SessionController::IsScreenLocked() const {
   return state_ == SessionState::LOCKED;
 }
 
 bool SessionController::ShouldLockScreenAutomatically() const {
   return should_lock_screen_automatically_;
 }
 
 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) are properly
+  //   activated before session state changes to ACTIVE.
+  // - LOCKED state with a running unlocking animation. This is needed because
+  //   the unlocking animation hides the lock container at the end. During the
+  //   unlock animation, IsUserSessionBlocked needs to return unblocked so that
+  //   user windows are deemed activatable and ash correctly restores the active
+  //   window before locking.
   return state_ != SessionState::ACTIVE &&
+         state_ != SessionState::LOGGED_IN_NOT_ACTIVE &&
          !(state_ == SessionState::LOCKED && is_unlocking_);
 }
 
 bool SessionController::IsInSecondaryLoginScreen() const {
   return state_ == SessionState::LOGIN_SECONDARY;
 }
 
 SessionState SessionController::GetSessionState() const {
   return state_;
 }
@@ skipping 211 matching lines @@
   const LoginStatus new_login_status = CalculateLoginStatus();
   if (new_login_status == login_status_)
     return;
 
   login_status_ = new_login_status;
   for (auto& observer : observers_)
     observer.LoginStatusChanged(login_status_);
 }
 
 }  // namespace ash