chrome/browser/extensions/extension_install_prompt.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/extensions/extension_install_prompt.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: Adding the AndroidPO2TS update 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/chromeos/settings/device_oauth2_token_service.cc ('K') | « chrome/browser/extensions/api/push_messaging/push_messaging_api.cc ('k') | chrome/browser/google_apis/auth_service.h » ('j') | chrome/browser/signin/android_profile_oauth2_token_service.cc » ('J')
Expand Comments ('e') | Collapse Comments ('c') | Hide Comments ('s')

Index: chrome/browser/extensions/extension_install_prompt.cc

diff --git a/chrome/browser/extensions/extension_install_prompt.cc b/chrome/browser/extensions/extension_install_prompt.cc

index 544c04e97d2f0b6f2b532009406a8c4f8486b330..e34165754097b3f7123dcf446fd7f17a59b294f0 100644

--- a/chrome/browser/extensions/extension_install_prompt.cc

+++ b/chrome/browser/extensions/extension_install_prompt.cc

@@ -714,14 +714,17 @@ void ExtensionInstallPrompt::FetchOAuthIssueAdviceIfNeeded() {

ProfileOAuth2TokenService* token_service =

ProfileOAuth2TokenServiceFactory::GetForProfile(install_ui_->profile());

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

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

+ token_service->GetPrimaryAccountId())) {

ShowConfirmation();

return;

}

// Get an access token from the token service.

login_token_request_ = token_service->StartRequest(

- OAuth2TokenService::ScopeSet(), this);

+ token_service->GetPrimaryAccountId(),

+ OAuth2TokenService::ScopeSet(),

+ this);

}

void ExtensionInstallPrompt::OnGetTokenSuccess(