chrome/browser/chromeos/login/supervised/supervised_user_authenticator.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/supervised/supervised_user_authenticator.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/session/user_session_manager.cc ('k') | chrome/browser/chromeos/login/users/chrome_user_manager_impl.cc » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Hide Comments ('s')

Index: chrome/browser/chromeos/login/supervised/supervised_user_authenticator.cc

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

index 7cbad7cc30d31cb755afadbc5f7c15f5b6612938..bca16cf031bd3978e905b7ceabb3d4b9f49217e0 100644

--- a/chrome/browser/chromeos/login/supervised/supervised_user_authenticator.cc

+++ b/chrome/browser/chromeos/login/supervised/supervised_user_authenticator.cc

@@ -70,7 +70,7 @@ void Mount(SupervisedUserAuthenticator::AuthAttempt* attempt,

Key key(attempt->password);

key.Transform(Key::KEY_TYPE_SALTED_SHA256_TOP_HALF, system_salt);

const AccountId account_id = user_manager::known_user::GetAccountId(

- attempt->username, std::string() /* gaia_id */);

+ attempt->username, std::string() /* id */, AccountType::UNKNOWN);

const cryptohome::Identification cryptohome_id(account_id);

cryptohome::AsyncMethodCaller::GetInstance()->AsyncMount(

cryptohome_id, key.GetSecret(), flags,

@@ -95,7 +95,7 @@ void AddKey(SupervisedUserAuthenticator::AuthAttempt* attempt,

Key master_key(plain_text_master_key);

master_key.Transform(Key::KEY_TYPE_SALTED_SHA256_TOP_HALF, system_salt);

const AccountId account_id = user_manager::known_user::GetAccountId(

- attempt->username, std::string() /* gaia_id */);

+ attempt->username, std::string() /* id */, AccountType::UNKNOWN);

cryptohome::AsyncMethodCaller::GetInstance()->AsyncAddKey(

cryptohome::Identification(account_id), user_key.GetSecret(),

master_key.GetSecret(),