| 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 a560184fb637ee9470f16adc22f7420f10f81743..06354a5b651c9da972d446b489e7d528e3f86810 100644
|
| --- a/chrome/browser/chromeos/login/session/user_session_manager.h
|
| +++ b/chrome/browser/chromeos/login/session/user_session_manager.h
|
| @@ -8,6 +8,7 @@
|
| #include <string>
|
|
|
| #include "base/basictypes.h"
|
| +#include "base/memory/scoped_ptr.h"
|
| #include "base/memory/singleton.h"
|
| #include "base/memory/weak_ptr.h"
|
| #include "base/observer_list.h"
|
| @@ -33,6 +34,8 @@ class User;
|
|
|
| namespace chromeos {
|
|
|
| +class EasyUnlockKeyManager;
|
| +
|
| class UserSessionManagerDelegate {
|
| public:
|
| // Called after profile is loaded and prepared for the session.
|
| @@ -152,6 +155,11 @@ class UserSessionManager
|
| scoped_refptr<input_method::InputMethodManager::State> GetDefaultIMEState(
|
| Profile* profile);
|
|
|
| + // Note this could return NULL if not enabled.
|
| + EasyUnlockKeyManager* easy_unlock_key_manager() {
|
| + return easy_unlock_key_manager_.get();
|
| + }
|
| +
|
| private:
|
| friend struct DefaultSingletonTraits<UserSessionManager>;
|
|
|
| @@ -235,6 +243,9 @@ class UserSessionManager
|
| // Notifies observers that user pending sessions restore has finished.
|
| void NotifyPendingUserSessionsRestoreFinished();
|
|
|
| + // Update Easy unlock cryptohome keys using the pairing data in user prefs.
|
| + void UpdateEasyUnlockKeys(Profile* user_profile);
|
| +
|
| UserSessionManagerDelegate* delegate_;
|
|
|
| // Authentication/user context.
|
| @@ -281,6 +292,9 @@ class UserSessionManager
|
| std::map<Profile*, scoped_refptr<input_method::InputMethodManager::State> >
|
| default_ime_states_;
|
|
|
| + // Manages Easy unlock cryptohome keys.
|
| + scoped_ptr<EasyUnlockKeyManager> easy_unlock_key_manager_;
|
| +
|
| DISALLOW_COPY_AND_ASSIGN(UserSessionManager);
|
| };
|
|
|
|
|