chrome/browser/local_discovery/privet_confirm_api_flow.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/local_discovery/privet_confirm_api_flow.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 bug affecting ProfileSyncService and CR comments. 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/invalidation/ticl_invalidation_service.cc ('K') | « chrome/browser/local_discovery/privet_confirm_api_flow.h ('k') | chrome/browser/local_discovery/privet_confirm_api_flow_unittest.cc » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Hide Comments ('s')

Index: chrome/browser/local_discovery/privet_confirm_api_flow.cc

diff --git a/chrome/browser/local_discovery/privet_confirm_api_flow.cc b/chrome/browser/local_discovery/privet_confirm_api_flow.cc

index 1917e4a7b28267be269f13fa78e3a333bf158cad..4ba47535668187abbcfa3db0d98706cb3e93c794 100644

--- a/chrome/browser/local_discovery/privet_confirm_api_flow.cc

+++ b/chrome/browser/local_discovery/privet_confirm_api_flow.cc

@@ -22,10 +22,12 @@ const char kCookieURLFormat[] = "%s&xsrf=%s&user=%d";

PrivetConfirmApiCallFlow::PrivetConfirmApiCallFlow(

net::URLRequestContextGetter* request_context,

OAuth2TokenService* token_service,

+ const std::string& account_id,

const GURL& automated_claim_url,

const ResponseCallback& callback)

: request_context_(request_context),

token_service_(token_service),

+ account_id_(account_id),

automated_claim_url_(automated_claim_url),

callback_(callback) {

}

@@ -51,7 +53,8 @@ void PrivetConfirmApiCallFlow::Start() {

if (UseOAuth2()) {

OAuth2TokenService::ScopeSet oauth_scopes;

oauth_scopes.insert(cloud_print::kCloudPrintAuth);

- oauth_request_ = token_service_->StartRequest(oauth_scopes, this);

+ oauth_request_ = token_service_->StartRequest(account_id_, oauth_scopes,

+ this);

} else {

GURL cookie_url(

base::StringPrintf(kCookieURLFormat,