chrome/browser/chromeos/login/easy_unlock/easy_unlock_remove_keys_operation.cc - Issue 1425093004: Revert of This CL replaces user_manager::UserID with 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_remove_keys_operation.cc

Issue 1425093004: Revert of This CL replaces user_manager::UserID with AccountId. (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@468875--Chrome-OS-handles-deletion-of-Gmail-account-poorly--Create-AccountID-structure-part2--user_names

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

« no previous file with comments | « chrome/browser/chromeos/login/easy_unlock/easy_unlock_key_manager.cc ('k') | chrome/browser/chromeos/login/easy_unlock/easy_unlock_tpm_key_manager_factory.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_remove_keys_operation.cc

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

index 9ead3ef42fd40c5a2ab78b6548481268a89a28d6..795db23dbe99b2dfe0f4d76490e508801c6d47d8 100644

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

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

@@ -47,8 +47,8 @@

}

void EasyUnlockRemoveKeysOperation::RemoveKey() {

- const std::string canonicalized =

- gaia::CanonicalizeEmail(user_context_.GetAccountId().GetUserEmail());

+ std::string canonicalized =

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

cryptohome::Identification id(canonicalized);

const Key* const auth_key = user_context_.GetKey();

cryptohome::Authorization auth(auth_key->GetSecret(), auth_key->GetLabel());