Restore last used user session after crash

chrome/browser/chromeos/login/users/chrome_user_manager_impl.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/users/chrome_user_manager_impl.h"
 
 #include <cstddef>
 #include <set>
 
 #include "ash/multi_profile_uma.h"
@@ skipping 987 matching lines @@
 void ChromeUserManagerImpl::NotifyUserListChanged() {
   content::NotificationService::current()->Notify(
       chrome::NOTIFICATION_USER_LIST_CHANGED,
       content::Source<UserManager>(this),
       content::NotificationService::NoDetails());
 }
 
 void ChromeUserManagerImpl::NotifyUserAddedToSession(
     const user_manager::User* added_user,
     bool user_switch_pending) {
-  if (user_switch_pending)
+  // Special case for user session restoration after browser crash.
+  // We don't switch to each user session that has been restored as once all
+  // session will be restored we'll switch to the session that has been used
+  // before the crash.
+  if (user_switch_pending &&
+      !UserSessionManager::GetInstance()->UserSessionsRestoreInProgress()) {
     SetPendingUserSwitchID(added_user->email());
+  }
 
   UpdateNumberOfUsers();
   ChromeUserManager::NotifyUserAddedToSession(added_user, user_switch_pending);
 }
 
 void ChromeUserManagerImpl::OnUserNotAllowed(const std::string& user_email) {
   LOG(ERROR) << "Shutdown session because a user is not allowed to be in the "
                 "current session";
   chromeos::ShowMultiprofilesSessionAbortedDialog(user_email);
 }
 
 void ChromeUserManagerImpl::UpdateNumberOfUsers() {
   size_t users = GetLoggedInUsers().size();
   if (users) {
     // Write the user number as UMA stat when a multi user session is possible.
     if ((users + GetUsersAdmittedForMultiProfile().size()) > 1)
       ash::MultiProfileUMA::RecordUserCount(users);
   }
 
   base::debug::SetCrashKeyValue(
       crash_keys::kNumberOfUsers,
       base::StringPrintf("%" PRIuS, GetLoggedInUsers().size()));
 }
 
 }  // namespace chromeos