chrome/browser/chromeos/drive/drive_integration_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/chromeos/drive/drive_integration_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: Addressing CR for patch 12 and one more Android issue 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

« no previous file with comments | « chrome/browser/chromeos/contacts/google_contact_store.cc ('k') | chrome/browser/chromeos/login/oauth2_login_verifier.cc » ('j') | chrome/browser/managed_mode/managed_user_refresh_token_fetcher_unittest.cc » ('J')
Expand Comments ('e') | Collapse Comments ('c') | Hide Comments ('s')

Index: chrome/browser/chromeos/drive/drive_integration_service.cc

diff --git a/chrome/browser/chromeos/drive/drive_integration_service.cc b/chrome/browser/chromeos/drive/drive_integration_service.cc

index dafcc21cfe32e869c2632e1e869c0c5b3a47a448..4e330714c5f80bddb8981467681eb9f62916b1f6 100644

--- a/chrome/browser/chromeos/drive/drive_integration_service.cc

+++ b/chrome/browser/chromeos/drive/drive_integration_service.cc

@@ -137,7 +137,7 @@ DriveIntegrationService::DriveIntegrationService(

blocking_task_runner_ = blocking_pool->GetSequencedTaskRunner(

blocking_pool->GetSequenceToken());

- OAuth2TokenService* oauth_service =

+ ProfileOAuth2TokenService* oauth_service =

ProfileOAuth2TokenServiceFactory::GetForProfile(profile);

if (test_drive_service) {

@@ -145,6 +145,7 @@ DriveIntegrationService::DriveIntegrationService(

} else if (util::IsDriveV2ApiEnabled()) {

drive_service_.reset(new DriveAPIService(

oauth_service,

+ oauth_service->GetPrimaryAccountId(),

g_browser_process->system_request_context(),

blocking_task_runner_.get(),

GURL(google_apis::DriveApiUrlGenerator::kBaseUrlForProduction),

@@ -154,6 +155,7 @@ DriveIntegrationService::DriveIntegrationService(

} else {

drive_service_.reset(new GDataWapiService(

oauth_service,

+ oauth_service->GetPrimaryAccountId(),

g_browser_process->system_request_context(),

blocking_task_runner_.get(),

GURL(google_apis::GDataWapiUrlGenerator::kBaseUrlForProduction),