chrome/browser/chromeos/contacts/google_contact_store.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/contacts/google_contact_store.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: Rebasing to include the update to ProfileSyncService: r224220 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/app_mode/startup_app_launcher.cc ('k') | chrome/browser/chromeos/drive/drive_integration_service.cc » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Hide Comments ('s')

Index: chrome/browser/chromeos/contacts/google_contact_store.cc

diff --git a/chrome/browser/chromeos/contacts/google_contact_store.cc b/chrome/browser/chromeos/contacts/google_contact_store.cc

index 45f03011adf637d300d5cef5f2b11e4d649efcdf..73a675236423189966184496045b53927b753819 100644

--- a/chrome/browser/chromeos/contacts/google_contact_store.cc

+++ b/chrome/browser/chromeos/contacts/google_contact_store.cc

@@ -129,10 +129,13 @@ void GoogleContactStore::Init() {

std::vector<std::string> scopes;

scopes.push_back(kContactsScope);

+ ProfileOAuth2TokenService* oauth2_service =

+ ProfileOAuth2TokenServiceFactory::GetForProfile(profile_);

gdata_service_.reset(new GDataContactsService(

url_request_context_getter_,

new google_apis::AuthService(

- ProfileOAuth2TokenServiceFactory::GetForProfile(profile_),

+ oauth2_service,

+ oauth2_service->GetPrimaryAccountId(),

url_request_context_getter_, scopes)));

}