[CrOS multi-profiles] Restore user sessions after crash

chrome/browser/chromeos/login/user_manager_impl.h

Index: chrome/browser/chromeos/login/user_manager_impl.h
diff --git a/chrome/browser/chromeos/login/user_manager_impl.h b/chrome/browser/chromeos/login/user_manager_impl.h
index 79275b64f1480556d5b5485fb7b875dd53bd3c1f..09dd48f887cceb3c531920f44b2b94aba1d41735 100644
--- a/chrome/browser/chromeos/login/user_manager_impl.h
+++ b/chrome/browser/chromeos/login/user_manager_impl.h
@@ -13,6 +13,7 @@
 #include "base/memory/scoped_ptr.h"
 #include "base/observer_list.h"
 #include "base/synchronization/lock.h"
+#include "chrome/browser/chromeos/login/login_utils.h"
 #include "chrome/browser/chromeos/login/user.h"
 #include "chrome/browser/chromeos/login/user_image_manager_impl.h"
 #include "chrome/browser/chromeos/login/user_manager.h"
@@ -40,6 +41,7 @@ class SessionLengthLimiter;
 // Implementation of the UserManager.
 class UserManagerImpl
     : public UserManager,
+      public LoginUtils::Delegate,
       public ProfileSyncServiceObserver,
       public content::NotificationObserver,
       public policy::DeviceLocalAccountPolicyService::Observer {
@@ -147,6 +149,10 @@ class UserManagerImpl
 
   UserManagerImpl();
 
+  // LoginUtils::Delegate implementation:
+  // Used when restoring user sessions after crash.
+  virtual void OnProfilePrepared(Profile* profile) OVERRIDE;
+
   // Loads |users_| from Local State if the list has not been loaded yet.
   // Subsequent calls have no effect. Must be called on the UI thread.
   void EnsureUsersLoaded();
@@ -274,6 +280,12 @@ class UserManagerImpl
       const SessionManagerClient::ActiveSessionsMap& sessions,
       bool success);
 
+  // Called by OnRestoreActiveSessions() when there're user sessions in
+  // |pending_user_sessions_| that has to be restored one by one.
+  // Also called after first user session from that list is restored and so on.
+  // Process continues till |pending_user_sessions_| map is not empty.
+  void RestorePendingUserSessions();
+
   // Interface to the signed settings store.
   CrosSettings* cros_settings_;
 
@@ -368,6 +380,10 @@ class UserManagerImpl
   // Specific flows by user e-mail.
   FlowMap specific_flows_;
 
+  // User sessions that has to be restored after browser crash.

[Dmitry Polukhin, 2013/05/27 13:51:04]

s/has/have/

[Nikita (slow), 2013/05/27 14:22:06]

Done.

+  // [user_id] > [user_id_hash]
+  SessionManagerClient::ActiveSessionsMap pending_user_sessions_;
+
   DISALLOW_COPY_AND_ASSIGN(UserManagerImpl);
 };