chrome/browser/chromeos/login/signin/oauth2_login_manager.cc - Issue 1165323004: We should use UserID object to identify users instead of username.

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/signin/oauth2_login_manager.cc

Issue 1165323004: We should use UserID object to identify users instead of username. Base URL: https://chromium.googlesource.com/chromium/src.git@master

Patch Set: Created 5 years, 6 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/signin/auth_sync_observer.cc ('K') | « chrome/browser/chromeos/login/signin/auth_sync_observer.cc ('k') | chrome/browser/chromeos/login/signin_screen_controller.h » ('j') | chrome/browser/chromeos/login/supervised/supervised_user_creation_controller_new.cc » ('J')
Expand Comments ('e') | Collapse Comments ('c') | Hide Comments ('s')

Index: chrome/browser/chromeos/login/signin/oauth2_login_manager.cc

diff --git a/chrome/browser/chromeos/login/signin/oauth2_login_manager.cc b/chrome/browser/chromeos/login/signin/oauth2_login_manager.cc

index 890bd89ac1bf289dce49121aae4e8b281c0e8f79..b9b298e51efc69409dda9fe0d435956e0dfa930d 100644

--- a/chrome/browser/chromeos/login/signin/oauth2_login_manager.cc

+++ b/chrome/browser/chromeos/login/signin/oauth2_login_manager.cc

@@ -108,7 +108,7 @@ void OAuth2LoginManager::RestoreSessionFromSavedTokens() {

// cause user to go through Gaia in next login to obtain a new refresh

// token.

user_manager::UserManager::Get()->SaveUserOAuthStatus(

- primary_account_id, user_manager::User::OAUTH_TOKEN_STATUS_UNKNOWN);

+ user_manager::UserID::FromUserEmail(primary_account_id), user_manager::User::OAUTH_TOKEN_STATUS_UNKNOWN);

token_service->LoadCredentials(primary_account_id);

}

@@ -148,7 +148,7 @@ void OAuth2LoginManager::OnRefreshTokenAvailable(

if (GetPrimaryAccountId() == account_id) {

// Token is loaded. Undo the flagging before token loading.

user_manager::UserManager::Get()->SaveUserOAuthStatus(

- account_id, user_manager::User::OAUTH2_TOKEN_STATUS_VALID);

+ user_manager::UserID::FromUserEmail(account_id), user_manager::User::OAUTH2_TOKEN_STATUS_VALID);

VerifySessionCookies();

}