| Index: chrome/browser/chromeos/login/session/user_session_manager.h
|
| diff --git a/chrome/browser/chromeos/login/session/user_session_manager.h b/chrome/browser/chromeos/login/session/user_session_manager.h
|
| index f05996c797e3bbd07bff8641f5c13388ca6e4965..2ca1f9765d99e60bdc9dfe50ce9f32a1ee8d0aac 100644
|
| --- a/chrome/browser/chromeos/login/session/user_session_manager.h
|
| +++ b/chrome/browser/chromeos/login/session/user_session_manager.h
|
| @@ -103,10 +103,14 @@ class UserSessionManager
|
| // and notifies observers.
|
| void RestoreActiveSessions();
|
|
|
| - // Returns true iff browser has been restarted after crash and UserManager
|
| - // finished restoring user sessions.
|
| + // Returns true iff browser has been restarted after crash and
|
| + // UserSessionManager finished restoring user sessions.
|
| bool UserSessionsRestored() const;
|
|
|
| + // Returns true iff browser has been restarted after crash and
|
| + // user sessions restoration is in progress.
|
| + bool UserSessionsRestoreInProgress() const;
|
| +
|
| // Initialize RLZ.
|
| void InitRlz(Profile* profile);
|
|
|
| @@ -256,10 +260,13 @@ class UserSessionManager
|
|
|
| // Active user session restoration related members.
|
|
|
| - // True is user sessions has been restored after crash.
|
| + // True if user sessions has been restored after crash.
|
| // On a normal boot then login into user sessions this will be false.
|
| bool user_sessions_restored_;
|
|
|
| + // True if user sessions restoration after crash is in progress.
|
| + bool user_sessions_restore_in_progress_;
|
| +
|
| // User sessions that have to be restored after browser crash.
|
| // [user_id] > [user_id_hash]
|
| SessionManagerClient::ActiveSessionsMap pending_user_sessions_;
|
|
|