chrome/browser/extensions/api/easy_unlock_private/easy_unlock_private_api.cc - Issue 1165323004: We should use UserID object to identify users instead of username.

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/extensions/api/easy_unlock_private/easy_unlock_private_api.cc

Issue 1165323004: We should use UserID object to identify users instead of username. Base URL: https://chromium.googlesource.com/chromium/src.git@master

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

« chrome/browser/chromeos/ownership/owner_settings_service_chromeos.cc ('K') | « chrome/browser/extensions/api/autotest_private/autotest_private_api.cc ('k') | chrome/browser/extensions/api/enterprise_platform_keys_private/enterprise_platform_keys_private_api.h » ('j') | chrome/browser/extensions/api/enterprise_platform_keys_private/enterprise_platform_keys_private_api.cc » ('J')
Expand Comments ('e') | Collapse Comments ('c') | Hide Comments ('s')

Index: chrome/browser/extensions/api/easy_unlock_private/easy_unlock_private_api.cc

diff --git a/chrome/browser/extensions/api/easy_unlock_private/easy_unlock_private_api.cc b/chrome/browser/extensions/api/easy_unlock_private/easy_unlock_private_api.cc

index b5f72bcef2d16f91bb12b371f08083d39bd48030..8051e03148831370cfdbc101fb58c43aa2657e7b 100644

--- a/chrome/browser/extensions/api/easy_unlock_private/easy_unlock_private_api.cc

+++ b/chrome/browser/extensions/api/easy_unlock_private/easy_unlock_private_api.cc

@@ -642,7 +642,7 @@ bool EasyUnlockPrivateGetSignInChallengeFunction::RunAsync() {

return false;

}

key_manager->SignUsingTpmKey(

- EasyUnlockService::Get(profile)->GetUserEmail(),

+ EasyUnlockService::Get(profile)->GetUserID(),

std::string(params->nonce.begin(), params->nonce.end()),

base::Bind(&EasyUnlockPrivateGetSignInChallengeFunction::OnDone, this,

challenge));

@@ -694,7 +694,7 @@ bool EasyUnlockPrivateGetUserInfoFunction::RunSync() {

EasyUnlockService* service =

EasyUnlockService::Get(Profile::FromBrowserContext(browser_context()));

std::vector<linked_ptr<easy_unlock_private::UserInfo> > users;

- std::string user_id = service->GetUserEmail();

+ user_manager::UserID user_id = service->GetUserID();

if (!user_id.empty()) {

users.push_back(

linked_ptr<easy_unlock_private::UserInfo>(