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

Unified Diff: chrome/browser/chromeos/login/user_manager_impl.cc

Issue 9466005: Make sure the device recovers from policy loss in the consumer case. (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: Rebased to ToT and cleaned up the unit tests. Created 8 years, 9 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/user_manager_impl.cc
diff --git a/chrome/browser/chromeos/login/user_manager_impl.cc b/chrome/browser/chromeos/login/user_manager_impl.cc
index 0cc82d7c520f441de1cc888b172bdb7e8fcb6b80..5f35d721f2dbd88c99e55798f4e7bba6142e5abf 100644
--- a/chrome/browser/chromeos/login/user_manager_impl.cc
+++ b/chrome/browser/chromeos/login/user_manager_impl.cc
@@ -288,6 +288,7 @@ UserManagerImpl::UserManagerImpl()
is_current_user_owner_(false),
is_current_user_new_(false),
is_current_user_ephemeral_(false),
+ key_store_loaded_(false),
ephemeral_users_enabled_(false),
observed_sync_service_(NULL),
last_image_set_async_(false),
@@ -880,6 +881,19 @@ void UserManagerImpl::NotifyOnLogin() {
content::Source<UserManagerImpl>(this),
content::Details<const User>(logged_in_user_));
+ LoadKeyStore();
+
+ // Schedules current user ownership check on file thread.
+ BrowserThread::PostTask(BrowserThread::FILE, FROM_HERE,
+ base::Bind(&UserManagerImpl::CheckOwnership,
+ base::Unretained(this)));
+}
+
+void UserManagerImpl::LoadKeyStore() {
+ CHECK(BrowserThread::CurrentlyOn(BrowserThread::UI));
+ if (key_store_loaded_)
+ return;
+
// Ensure we've opened the real user's key/certificate database.
crypto::OpenPersistentNSSDB();
@@ -894,11 +908,7 @@ void UserManagerImpl::NotifyOnLogin() {
// Note: this calls crypto::EnsureTPMTokenReady()
cert_library->RequestCertificates();
}
-
- // Schedules current user ownership check on file thread.
- BrowserThread::PostTask(BrowserThread::FILE, FROM_HERE,
- base::Bind(&UserManagerImpl::CheckOwnership,
- base::Unretained(this)));
+ key_store_loaded_ = true;
}
void UserManagerImpl::SetInitialUserImage(const std::string& username) {
« no previous file with comments | « chrome/browser/chromeos/login/user_manager_impl.h ('k') | chrome/browser/chromeos/stub_cros_settings_provider.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698