chrome/browser/signin/chrome_signin_client.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/chrome_signin_client.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/profiles/profile_manager_unittest.cc ('k') | chrome/browser/signin/easy_unlock_service.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/chrome_signin_client.cc

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

index 0247781b417681e3de6065bd6583fa06032b7d8c..e98d266342ae639e4f93f0aca93725e00711aa2e 100644

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

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

@@ -64,7 +64,7 @@ ChromeSigninClient::ChromeSigninClient(

if (!user)

return;

auto* user_manager = user_manager::UserManager::Get();

- const std::string& user_id = user->GetUserID();

+ const AccountId user_id = user->GetAccountId();

if (user_manager->GetKnownUserDeviceId(user_id).empty()) {

const std::string legacy_device_id =

GetPrefs()->GetString(prefs::kGoogleServicesSigninScopedDeviceId);

@@ -154,7 +154,8 @@ std::string ChromeSigninClient::GetSigninScopedDeviceId() {

return std::string();

const std::string signin_scoped_device_id =

- user_manager::UserManager::Get()->GetKnownUserDeviceId(user->GetUserID());

+ user_manager::UserManager::Get()->GetKnownUserDeviceId(

+ user->GetAccountId());

LOG_IF(ERROR, signin_scoped_device_id.empty())

<< "Device ID is not set for user.";

return signin_scoped_device_id;