chrome/browser/drive/gdata_wapi_service.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/drive/gdata_wapi_service.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/chromeos/settings/device_oauth2_token_service.cc ('K') | « chrome/browser/drive/gdata_wapi_service.h ('k') | chrome/browser/extensions/api/identity/experimental_identity_api.cc » ('j') | chrome/browser/signin/profile_oauth2_token_service.cc » ('J')
Expand Comments ('e') | Collapse Comments ('c') | Hide Comments ('s')

Index: chrome/browser/drive/gdata_wapi_service.cc

diff --git a/chrome/browser/drive/gdata_wapi_service.cc b/chrome/browser/drive/gdata_wapi_service.cc

index 8b6e9eb8fc5cd58a6241d73740b5246664fb76e5..eb2d3ab747457cef2d8bafcbe11ce46a86117513 100644

--- a/chrome/browser/drive/gdata_wapi_service.cc

+++ b/chrome/browser/drive/gdata_wapi_service.cc

@@ -127,12 +127,14 @@ void ParseAppListAndRun(

GDataWapiService::GDataWapiService(

OAuth2TokenService* oauth2_token_service,

+ const std::string& account_id,

net::URLRequestContextGetter* url_request_context_getter,

base::TaskRunner* blocking_task_runner,

const GURL& base_url,

const GURL& base_download_url,

const std::string& custom_user_agent)

: oauth2_token_service_(oauth2_token_service),

+ account_id_(account_id),

url_request_context_getter_(url_request_context_getter),

blocking_task_runner_(blocking_task_runner),

url_generator_(base_url, base_download_url),

@@ -156,8 +158,10 @@ void GDataWapiService::Initialize() {

// Drive App scope is required for even WAPI v3 apps access.

scopes.push_back(util::kDriveAppsScope);

sender_.reset(new RequestSender(

- new AuthService(

- oauth2_token_service_, url_request_context_getter_, scopes),

+ new AuthService(oauth2_token_service_,

+ account_id_,

+ url_request_context_getter_,

+ scopes),

url_request_context_getter_,

blocking_task_runner_.get(),

custom_user_agent_));