chrome/browser/ui/webui/local_discovery/local_discovery_ui_handler.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/webui/local_discovery/local_discovery_ui_handler.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: Fixing a unit test, addressing comments from courage@ Created 7 years, 3 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/sync/profile_sync_service_unittest.cc ('K') | « chrome/browser/ui/auto_login_prompter.cc ('k') | chrome/browser/ui/webui/print_preview/print_preview_handler.cc » ('j') | google_apis/gaia/oauth2_token_service.h » ('J')
Expand Comments ('e') | Collapse Comments ('c') | Hide Comments ('s')

Index: chrome/browser/ui/webui/local_discovery/local_discovery_ui_handler.cc

diff --git a/chrome/browser/ui/webui/local_discovery/local_discovery_ui_handler.cc b/chrome/browser/ui/webui/local_discovery/local_discovery_ui_handler.cc

index 1895c94dbbad88901dd15b4b7bd03f0839bd6d59..bffa90eab5f4434897c27437b583ac42ef089539 100644

--- a/chrome/browser/ui/webui/local_discovery/local_discovery_ui_handler.cc

+++ b/chrome/browser/ui/webui/local_discovery/local_discovery_ui_handler.cc

@@ -182,7 +182,7 @@ void LocalDiscoveryUIHandler::OnPrivetRegisterClaimToken(

Profile* profile = Profile::FromWebUI(web_ui());

if (current_register_user_index_ == kAccountIndexUseOAuth2) {

- OAuth2TokenService* token_service =

+ ProfileOAuth2TokenService* token_service =

ProfileOAuth2TokenServiceFactory::GetForProfile(profile);

if (!token_service) {

@@ -193,6 +193,7 @@ void LocalDiscoveryUIHandler::OnPrivetRegisterClaimToken(

confirm_api_call_flow_.reset(new PrivetConfirmApiCallFlow(

profile->GetRequestContext(),

token_service,

+ token_service->GetPrimaryAccountId(),

automated_claim_url,

base::Bind(&LocalDiscoveryUIHandler::OnConfirmDone,

base::Unretained(this))));