chrome/browser/chromeos/login/easy_unlock/easy_unlock_get_keys_operation.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/chromeos/login/easy_unlock/easy_unlock_get_keys_operation.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/login/app_launch_signin_screen.cc ('K') | « chrome/browser/chromeos/login/easy_unlock/easy_unlock_create_keys_operation.cc ('k') | chrome/browser/chromeos/login/easy_unlock/easy_unlock_key_manager.h » ('j') | chrome/browser/chromeos/login/easy_unlock/easy_unlock_remove_keys_operation.cc » ('J')
Expand Comments ('e') | Collapse Comments ('c') | Hide Comments ('s')

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

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

index e0789c8005fe615bf03e3f46fb0c7b8ae497ee8c..87bb62ee2963fcefe12e6aecf7f59b92d620b5be 100644

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

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

@@ -32,9 +32,9 @@ void EasyUnlockGetKeysOperation::Start() {

}

void EasyUnlockGetKeysOperation::GetKeyData() {

- std::string canonicalized =

- gaia::CanonicalizeEmail(user_context_.GetUserID());

- cryptohome::Identification id(canonicalized);

+ user_manager::UserID user_id(user_context_.GetUserID());

+ user_id.SetUserEmail(gaia::CanonicalizeEmail(user_id.GetUserEmail()));

+ cryptohome::Identification id(user_id);

cryptohome::HomedirMethods::GetInstance()->GetKeyDataEx(

id,

EasyUnlockKeyManager::GetKeyLabel(key_index_),