chrome/browser/ui/auto_login_prompter.cc - Issue 23382008: Making OAuth2TokenService multi-login aware, updating callers, minor fixes

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/ui/auto_login_prompter.cc

Issue 23382008: Making OAuth2TokenService multi-login aware, updating callers, minor fixes (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master

Patch Set: Updates to AndroidPO2TS and removing the DCHECK(signin_manager) from GetPrimaryAccountId Created 7 years, 4 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/signin/profile_oauth2_token_service_unittest.cc ('K') | « chrome/browser/sync_file_system/drive_backend/api_util.cc ('k') | chrome/browser/ui/webui/local_discovery/local_discovery_ui_handler.cc » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Hide Comments ('s')

Index: chrome/browser/ui/auto_login_prompter.cc

diff --git a/chrome/browser/ui/auto_login_prompter.cc b/chrome/browser/ui/auto_login_prompter.cc

index 9d9bff0c2c683bee7668e119e510d0f256dc0121..70311db135a30bb0a1e14e8b28d85fdb178282fd 100644

--- a/chrome/browser/ui/auto_login_prompter.cc

+++ b/chrome/browser/ui/auto_login_prompter.cc

@@ -31,16 +31,18 @@ namespace {

bool FetchUsernameThroughSigninManager(Profile* profile, std::string* output) {

// In an incognito window these services are not available.

- ProfileOAuth2TokenService* token_service =

- ProfileOAuth2TokenServiceFactory::GetForProfile(profile);

- if (!token_service || !token_service->RefreshTokenIsAvailable())

- return false;

SigninManagerBase* signin_manager =

SigninManagerFactory::GetInstance()->GetForProfile(profile);

if (!signin_manager)

return false;

+ ProfileOAuth2TokenService* token_service =

+ ProfileOAuth2TokenServiceFactory::GetForProfile(profile);

+ if (!token_service || !token_service->RefreshTokenIsAvailable(

+ token_service->GetPrimaryAccountId())) {

+ return false;

+ }

*output = signin_manager->GetAuthenticatedUsername();

return true;

}