chrome/browser/chromeos/login/easy_unlock/easy_unlock_tpm_key_manager_factory.cc - Issue 2529103002: Add account_type into AccountId

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 2529103002: Add account_type into AccountId (Closed)

Patch Set: Fix MultiUserWindowManagerChromeOSTest.* Created 4 years 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/bootstrap_user_context_initializer.cc ('k') | chrome/browser/chromeos/login/screens/chrome_user_selection_screen.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 cdce1cf147f128142d18059604b954bf34da00eb..04a96fb508b65f32959eeb01c0f6b2edd7eda355 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

@@ -40,8 +40,9 @@ EasyUnlockTpmKeyManager* EasyUnlockTpmKeyManagerFactory::Get(

EasyUnlockTpmKeyManager* EasyUnlockTpmKeyManagerFactory::GetForUser(

const std::string& user_id) {

user_manager::UserManager* user_manager = user_manager::UserManager::Get();

- const user_manager::User* user = user_manager->FindUser(

- user_manager::known_user::GetAccountId(user_id, std::string()));

+ const user_manager::User* user =

+ user_manager->FindUser(user_manager::known_user::GetAccountId(

+ user_id, std::string() /* id */, AccountType::UNKNOWN));

if (!user)

return NULL;

Profile* profile = chromeos::ProfileHelper::Get()->GetProfileByUser(user);