chrome/browser/chromeos/login/easy_unlock/easy_unlock_tpm_key_manager_factory.cc - Issue 1138123003: Delay creating easy signin TPM keys until TPM is initialized

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/easy_unlock/easy_unlock_tpm_key_manager_factory.cc

Issue 1138123003: Delay creating easy signin TPM keys until TPM is initialized (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master

Patch Set: pneubeck comments Created 5 years, 7 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

« no previous file with comments | « chrome/browser/chromeos/login/easy_unlock/easy_unlock_tpm_key_manager.cc ('k') | chrome/browser/chromeos/login/easy_unlock/easy_unlock_tpm_key_manager_unittest.cc » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Hide Comments ('s')

Index: chrome/browser/chromeos/login/easy_unlock/easy_unlock_tpm_key_manager_factory.cc

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

index 1e057457198c4d32416768c784c125a4de935ce6..c12f2fbe7f507dbeee13f83de592f17b0336db20 100644

--- a/chrome/browser/chromeos/login/easy_unlock/easy_unlock_tpm_key_manager_factory.cc

+++ b/chrome/browser/chromeos/login/easy_unlock/easy_unlock_tpm_key_manager_factory.cc

@@ -61,8 +61,9 @@ KeyedService* EasyUnlockTpmKeyManagerFactory::BuildServiceInstanceFor(

const user_manager::User* user = NULL;

if (!chromeos::ProfileHelper::IsSigninProfile(profile))

user = chromeos::ProfileHelper::Get()->GetUserByProfile(profile);

- return new EasyUnlockTpmKeyManager(user ? user->email() : std::string(),

- GetLocalState());

+ return new EasyUnlockTpmKeyManager(

+ user ? user->email() : std::string(),

+ user ? user->username_hash() : std::string(), GetLocalState());

}

content::BrowserContext* EasyUnlockTpmKeyManagerFactory::GetBrowserContextToUse(