Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(992)

Unified Diff: chrome/browser/chromeos/login/session/user_session_manager.h

Issue 554043003: cros: Create cryptohome keys for Easy sign-in. (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: fix use-after-free Created 6 years, 3 months ago
Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.
Jump to:
View side-by-side diff with in-line comments
Download patch
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..eee7932fb4548f241a2cd32a4419a66aea770ad0 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,8 @@ class UserSessionManager
std::map<Profile*, scoped_refptr<input_method::InputMethodManager::State> >
default_ime_states_;
tbarzic 2014/09/09 19:32:21 can you add a comment?
xiyuan 2014/09/09 20:25:31 Done.
+ scoped_ptr<EasyUnlockKeyManager> easy_unlock_key_manager_;
+
DISALLOW_COPY_AND_ASSIGN(UserSessionManager);
};

Powered by Google App Engine
This is Rietveld 408576698