chrome/browser/signin/easy_unlock_service.cc - Issue 1412813003: 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/signin/easy_unlock_service.cc

Issue 1412813003: 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: Update after review. 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

« chrome/browser/chromeos/login/app_launch_controller.cc ('K') | « chrome/browser/signin/chrome_signin_client.cc ('k') | chrome/browser/signin/easy_unlock_service_signin_chromeos.cc » ('j') | chrome/browser/ui/ash/launcher/chrome_launcher_controller_unittest.cc » ('J')
Expand Comments ('e') | Collapse Comments ('c') | Hide Comments ('s')

Index: chrome/browser/signin/easy_unlock_service.cc

diff --git a/chrome/browser/signin/easy_unlock_service.cc b/chrome/browser/signin/easy_unlock_service.cc

index 0eda490a962fe4704665452e72b2e71409369ddd..109d01f78cb6a4a157f9fb0e297e053d891f9b1e 100644

--- a/chrome/browser/signin/easy_unlock_service.cc

+++ b/chrome/browser/signin/easy_unlock_service.cc

@@ -56,6 +56,7 @@

#include "chrome/browser/chromeos/profiles/profile_helper.h"

#include "chromeos/dbus/dbus_thread_manager.h"

#include "chromeos/dbus/power_manager_client.h"

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

#include "components/user_manager/user_manager.h"

#endif

@@ -612,11 +613,9 @@ void EasyUnlockService::CheckCryptohomeKeysAndMaybeHardlock() {

DCHECK(key_manager);

key_manager->GetDeviceDataList(

- chromeos::UserContext(user_id),

+ chromeos::UserContext(AccountId::FromUserEmail(user_id)),

base::Bind(&EasyUnlockService::OnCryptohomeKeysFetchedForChecking,

- weak_ptr_factory_.GetWeakPtr(),

- user_id,

- paired_devices));

+ weak_ptr_factory_.GetWeakPtr(), user_id, paired_devices));

#endif

}