chrome/browser/chromeos/settings/device_oauth2_token_service.h - 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/settings/device_oauth2_token_service.h

Issue 23382008: Making OAuth2TokenService multi-login aware, updating callers, minor fixes (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master

Patch Set: Adding the AndroidPO2TS update 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

« no previous file with comments | « chrome/browser/chromeos/policy/user_cloud_policy_token_forwarder.cc ('k') | chrome/browser/chromeos/settings/device_oauth2_token_service.cc » ('j') | chrome/browser/chromeos/settings/device_oauth2_token_service.cc » ('J')
Expand Comments ('e') | Collapse Comments ('c') | Hide Comments ('s')

Index: chrome/browser/chromeos/settings/device_oauth2_token_service.h

diff --git a/chrome/browser/chromeos/settings/device_oauth2_token_service.h b/chrome/browser/chromeos/settings/device_oauth2_token_service.h

index 1ce619691a64620465b91751839eee9b684e240b..24a18740088d89d0993b864f67932e6ac1ef61a9 100644

--- a/chrome/browser/chromeos/settings/device_oauth2_token_service.h

+++ b/chrome/browser/chromeos/settings/device_oauth2_token_service.h

@@ -39,7 +39,8 @@ class DeviceOAuth2TokenService : public OAuth2TokenService {

public:

// Specialization of StartRequest that in parallel validates that the refresh

// token stored on the device is owned by the device service account.

- virtual scoped_ptr<Request> StartRequest(const ScopeSet& scopes,

+ virtual scoped_ptr<Request> StartRequest(const std::string& account_id,

+ const ScopeSet& scopes,

Consumer* consumer) OVERRIDE;

// Persist the given refresh token on the device. Overwrites any previous

@@ -48,7 +49,7 @@ class DeviceOAuth2TokenService : public OAuth2TokenService {

static void RegisterPrefs(PrefRegistrySimple* registry);

- virtual std::string GetRefreshToken() OVERRIDE;

+ virtual std::string GetRefreshToken(const std::string& account_id) OVERRIDE;

protected:

// Pull the robot account ID from device policy.