chrome/browser/chromeos/login/user_manager.cc - Issue 8212003: [chromiumos] Start TPM token initialization re-tries on login

Keyboard Shortcuts

	File
u :	up to issue
j / k :	jump to file after / before current file
J / K :	jump to next file with a comment after / before current file
	Side-by-side diff
i :	toggle intra-line diffs
e :	expand all comments
c :	collapse all comments
s :	toggle showing all comments
n / p :	next / previous diff chunk or comment
N / P :	next / previous comment
<Up> / <Down> :	next / previous line

	Issue
u :	up to list of issues
j / k :	jump to patch after / before current patch
o / <Enter> :	open current patch in side-by-side view
i :	open current patch in unified diff view

	Issue List
j / k :	jump to issue after / before current issue
o / <Enter> :	open current issue

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

Issue 8212003: [chromiumos] Start TPM token initialization re-tries on login (Closed) Base URL: http://git.chromium.org/chromium/src.git@master

Patch Set: . Created 9 years, 2 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:

Index: chrome/browser/chromeos/login/user_manager.cc

diff --git a/chrome/browser/chromeos/login/user_manager.cc b/chrome/browser/chromeos/login/user_manager.cc

index 53d66f133e8b3fdb9fcba179b2cade68faf651b2..147ac48c57da2c5887490f6df8bd58a366f1f631 100644

--- a/chrome/browser/chromeos/login/user_manager.cc

+++ b/chrome/browser/chromeos/login/user_manager.cc

@@ -21,6 +21,7 @@

#include "base/values.h"

#include "crypto/nss_util.h"

#include "chrome/browser/browser_process.h"

+#include "chrome/browser/chromeos/cros/cert_library.h"

#include "chrome/browser/chromeos/cros/cros_library.h"

#include "chrome/browser/chromeos/cros/cryptohome_library.h"

#include "chrome/browser/chromeos/input_method/input_method_manager.h"

@@ -766,6 +767,8 @@ void UserManager::NotifyOnLogin() {

if (CommandLine::ForCurrentProcess()->HasSwitch(

switches::kLoadOpencryptoki)) {

crypto::EnableTPMTokenForNSS(new RealTPMTokenInfoDelegate());

+ cert_library_ = chromeos::CrosLibrary::Get()->GetCertLibrary();

+ cert_library_->RequestCertificates();

}

// Schedules current user ownership check on file thread.