| OLD | NEW |
| 1 // Copyright 2014 The Chromium Authors. All rights reserved. | 1 // Copyright 2014 The Chromium Authors. All rights reserved. |
| 2 // Use of this source code is governed by a BSD-style license that can be | 2 // Use of this source code is governed by a BSD-style license that can be |
| 3 // found in the LICENSE file. | 3 // found in the LICENSE file. |
| 4 | 4 |
| 5 #ifndef CHROME_BROWSER_CHROMEOS_LOGIN_SESSION_USER_SESSION_MANAGER_H_ | 5 #ifndef CHROME_BROWSER_CHROMEOS_LOGIN_SESSION_USER_SESSION_MANAGER_H_ |
| 6 #define CHROME_BROWSER_CHROMEOS_LOGIN_SESSION_USER_SESSION_MANAGER_H_ | 6 #define CHROME_BROWSER_CHROMEOS_LOGIN_SESSION_USER_SESSION_MANAGER_H_ |
| 7 | 7 |
| 8 #include <string> | 8 #include <string> |
| 9 | 9 |
| 10 #include "base/callback.h" | 10 #include "base/callback.h" |
| (...skipping 415 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 426 | 426 |
| 427 // True if user sessions has been restored after crash. | 427 // True if user sessions has been restored after crash. |
| 428 // On a normal boot then login into user sessions this will be false. | 428 // On a normal boot then login into user sessions this will be false. |
| 429 bool user_sessions_restored_; | 429 bool user_sessions_restored_; |
| 430 | 430 |
| 431 // True if user sessions restoration after crash is in progress. | 431 // True if user sessions restoration after crash is in progress. |
| 432 bool user_sessions_restore_in_progress_; | 432 bool user_sessions_restore_in_progress_; |
| 433 | 433 |
| 434 // User sessions that have to be restored after browser crash. | 434 // User sessions that have to be restored after browser crash. |
| 435 // [user_id] > [user_id_hash] | 435 // [user_id] > [user_id_hash] |
| 436 SessionManagerClient::ActiveSessionsMap pending_user_sessions_; | 436 using PendingUserSessions = std::map<AccountId, std::string>; |
| 437 |
| 438 PendingUserSessions pending_user_sessions_; |
| 437 | 439 |
| 438 base::ObserverList<chromeos::UserSessionStateObserver> | 440 base::ObserverList<chromeos::UserSessionStateObserver> |
| 439 session_state_observer_list_; | 441 session_state_observer_list_; |
| 440 | 442 |
| 441 // OAuth2 session related members. | 443 // OAuth2 session related members. |
| 442 | 444 |
| 443 // True if we should restart chrome right after session restore. | 445 // True if we should restart chrome right after session restore. |
| 444 bool exit_after_session_restore_; | 446 bool exit_after_session_restore_; |
| 445 | 447 |
| 446 // Sesion restore strategy. | 448 // Sesion restore strategy. |
| (...skipping 30 matching lines...) Expand all Loading... |
| 477 bool waiting_for_child_account_status_; | 479 bool waiting_for_child_account_status_; |
| 478 | 480 |
| 479 base::WeakPtrFactory<UserSessionManager> weak_factory_; | 481 base::WeakPtrFactory<UserSessionManager> weak_factory_; |
| 480 | 482 |
| 481 DISALLOW_COPY_AND_ASSIGN(UserSessionManager); | 483 DISALLOW_COPY_AND_ASSIGN(UserSessionManager); |
| 482 }; | 484 }; |
| 483 | 485 |
| 484 } // namespace chromeos | 486 } // namespace chromeos |
| 485 | 487 |
| 486 #endif // CHROME_BROWSER_CHROMEOS_LOGIN_SESSION_USER_SESSION_MANAGER_H_ | 488 #endif // CHROME_BROWSER_CHROMEOS_LOGIN_SESSION_USER_SESSION_MANAGER_H_ |
| OLD | NEW |