Restore last used user session after crash

chrome/browser/chromeos/login/session/user_session_manager.cc

 // Copyright 2014 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 "chrome/browser/chromeos/login/session/user_session_manager.h"
 
 #include <string>
 
 #include "base/base_paths.h"
 #include "base/bind.h"
@@ skipping 202 matching lines @@
 // static
 void UserSessionManager::RegisterPrefs(PrefRegistrySimple* registry) {
   registry->RegisterStringPref(prefs::kRLZBrand, std::string());
   registry->RegisterBooleanPref(prefs::kRLZDisabled, false);
 }
 
 UserSessionManager::UserSessionManager()
     : delegate_(NULL),
       has_auth_cookies_(false),
       user_sessions_restored_(false),
+      user_sessions_restore_in_progress_(false),
       exit_after_session_restore_(false),
       session_restore_strategy_(
           OAuth2LoginManager::RESTORE_FROM_SAVED_OAUTH2_REFRESH_TOKEN) {
   net::NetworkChangeNotifier::AddConnectionTypeObserver(this);
   user_manager::UserManager::Get()->AddSessionStateObserver(this);
 }
 
 UserSessionManager::~UserSessionManager() {
   // UserManager is destroyed before singletons, so we need to check if it
   // still exists.
@@ skipping 60 matching lines @@
   } else {
     // Even if we're online we should wait till initial
     // OnConnectionTypeChanged() call. Otherwise starting fetchers too early may
     // end up canceling all request when initial network connection type is
     // processed. See http://crbug.com/121643.
     pending_signin_restore_sessions_.insert(user->email());
   }
 }
 
 void UserSessionManager::RestoreActiveSessions() {
+  user_sessions_restore_in_progress_ = true;
   DBusThreadManager::Get()->GetSessionManagerClient()->RetrieveActiveSessions(
       base::Bind(&UserSessionManager::OnRestoreActiveSessions,
                  base::Unretained(this)));
 }
 
 bool UserSessionManager::UserSessionsRestored() const {
   DCHECK(content::BrowserThread::CurrentlyOn(content::BrowserThread::UI));
   return user_sessions_restored_;
 }
 
+bool UserSessionManager::UserSessionsRestoreInProgress() const {
+  DCHECK(content::BrowserThread::CurrentlyOn(content::BrowserThread::UI));
+  return user_sessions_restore_in_progress_;
+}
+
 void UserSessionManager::InitRlz(Profile* profile) {
 #if defined(ENABLE_RLZ)
   if (!g_browser_process->local_state()->HasPrefPath(prefs::kRLZBrand)) {
     // Read brand code asynchronously from an OEM data and repost ourselves.
     google_brand::chromeos::InitBrand(
         base::Bind(&UserSessionManager::InitRlz, AsWeakPtr(), profile));
     return;
   }
   base::PostTaskAndReplyWithResult(
       base::WorkerPool::GetTaskRunner(false).get(),
@@ skipping 614 matching lines @@
   for (it = sessions.begin(); it != sessions.end(); ++it) {
     if (active_user_id == it->first)
       continue;
     pending_user_sessions_[it->first] = it->second;
   }
   RestorePendingUserSessions();
 }
 
 void UserSessionManager::RestorePendingUserSessions() {
   if (pending_user_sessions_.empty()) {
+    user_manager::UserManager::Get()->SwitchToLastActiveUser();
     NotifyPendingUserSessionsRestoreFinished();
     return;
   }
 
   // Get next user to restore sessions and delete it from list.
   SessionManagerClient::ActiveSessionsMap::const_iterator it =
       pending_user_sessions_.begin();
   std::string user_id = it->first;
   std::string user_id_hash = it->second;
   DCHECK(!user_id.empty());
@@ skipping 27 matching lines @@
                  true,   // has_active_session
                  this);
   } else {
     RestorePendingUserSessions();
   }
 }
 
 void UserSessionManager::NotifyPendingUserSessionsRestoreFinished() {
   DCHECK(content::BrowserThread::CurrentlyOn(content::BrowserThread::UI));
   user_sessions_restored_ = true;
+  user_sessions_restore_in_progress_ = false;
   FOR_EACH_OBSERVER(chromeos::UserSessionStateObserver,
                     session_state_observer_list_,
                     PendingUserSessionsRestoreFinished());
 }
 
 void UserSessionManager::UpdateEasyUnlockKeys(Profile* user_profile) {
   if (!GetEasyUnlockKeyManager())
     return;
 
   // Only update Easy unlock keys for regular user.
@@ skipping 58 matching lines @@
     return NULL;
   }
 
   if (!easy_unlock_key_manager_)
     easy_unlock_key_manager_.reset(new EasyUnlockKeyManager);
 
   return easy_unlock_key_manager_.get();
 }
 
 }  // namespace chromeos