chrome/browser/chromeos/login/easy_unlock/easy_unlock_get_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_get_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_create_keys_operation.cc ('k') | chrome/browser/chromeos/login/easy_unlock/easy_unlock_key_manager.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_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 7e6256797d69a2bd2406182e32464b46ba4029e1..e0789c8005fe615bf03e3f46fb0c7b8ae497ee8c 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

@@ -9,7 +9,6 @@

#include "base/bind.h"

#include "base/logging.h"

#include "chrome/browser/chromeos/login/easy_unlock/easy_unlock_key_manager.h"

-#include "components/signin/core/account_id/account_id.h"

#include "google_apis/gaia/gaia_auth_util.h"

namespace chromeos {

@@ -33,8 +32,8 @@

}

void EasyUnlockGetKeysOperation::GetKeyData() {

- const std::string canonicalized =

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

+ std::string canonicalized =

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

cryptohome::Identification id(canonicalized);

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

id,