| 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 581847f7ba6fc56d5ef97df7f99b62602c975bcd..3e171608962f75f1cdf2c7c53c93428b4647f6d8 100644
|
| --- a/chrome/browser/chromeos/login/session/user_session_manager.h
|
| +++ b/chrome/browser/chromeos/login/session/user_session_manager.h
|
| @@ -247,6 +247,10 @@ class UserSessionManager
|
| // Used when restoring user sessions after crash.
|
| void OnProfilePrepared(Profile* profile, bool browser_launched) override;
|
|
|
| + void ChildAccountStatusReceivedCallback();
|
| +
|
| + void StopChildStatusObserving();
|
| +
|
| void CreateUserSession(const UserContext& user_context,
|
| bool has_auth_cookies);
|
| void PreStartSession();
|
| @@ -412,6 +416,11 @@ class UserSessionManager
|
| // Whether should launch browser, tests may override this value.
|
| bool should_launch_browser_;
|
|
|
| + // Child account status is necessary for InitializeStartUrls call.
|
| + bool waiting_for_child_account_status_;
|
| +
|
| + base::WeakPtrFactory<UserSessionManager> weak_factory_;
|
| +
|
| DISALLOW_COPY_AND_ASSIGN(UserSessionManager);
|
| };
|
|
|
|
|