components/user_manager/user_manager_base.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: components/user_manager/user_manager_base.cc

Issue 2529103002: Add account_type into AccountId (Closed)

Patch Set: Created 4 years, 1 month 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: components/user_manager/user_manager_base.cc

diff --git a/components/user_manager/user_manager_base.cc b/components/user_manager/user_manager_base.cc

index 2c7b3ffddaff6b26cf2afabb450f9794db72702e..eaf351bbfe63f36f8639c2b865cc9a850593af6a 100644

--- a/components/user_manager/user_manager_base.cc

+++ b/components/user_manager/user_manager_base.cc

@@ -490,7 +490,8 @@ void UserManagerBase::ParseUserList(const base::ListValue& users_list,

continue;

}

- const AccountId account_id = known_user::GetAccountId(email, std::string());

+ const AccountId account_id = known_user::GetAccountId(

+ email, std::string() /* gaia_id */, std::string() /* account_type */);

if (existing_users.find(account_id) != existing_users.end() ||

!users_set->insert(account_id).second) {