chrome/browser/chromeos/login/easy_unlock/easy_unlock_key_manager.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_key_manager.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_get_keys_operation.cc ('k') | chrome/browser/chromeos/login/easy_unlock/easy_unlock_remove_keys_operation.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_key_manager.cc

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

index 3cfa4bcaef4ccf47a93e3e0395b1c67388875d97..c1ba482f8700a591071a68b460737137f662102f 100644

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

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

@@ -11,7 +11,6 @@

#include "base/values.h"

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

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

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

namespace chromeos {

@@ -53,7 +52,7 @@

EasyUnlockTpmKeyManager* tpm_key_manager =

EasyUnlockTpmKeyManagerFactory::GetInstance()->GetForUser(

- user_context.GetAccountId().GetUserEmail());

+ user_context.GetUserID());

if (!tpm_key_manager) {

LOG(ERROR) << "No TPM key manager.";

callback.Run(false);

@@ -82,9 +81,9 @@

const RefreshKeysCallback& callback) {

EasyUnlockTpmKeyManager* tpm_key_manager =

EasyUnlockTpmKeyManagerFactory::GetInstance()->GetForUser(

- user_context.GetAccountId().GetUserEmail());

- const std::string tpm_public_key = tpm_key_manager->GetPublicTpmKey(

- user_context.GetAccountId().GetUserEmail());

+ user_context.GetUserID());

+ std::string tpm_public_key =

+ tpm_key_manager->GetPublicTpmKey(user_context.GetUserID());

EasyUnlockDeviceKeyDataList devices;

if (!RemoteDeviceListToDeviceDataList(*remote_devices, &devices))