chrome/browser/chromeos/policy/user_cloud_policy_token_forwarder.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/policy/user_cloud_policy_token_forwarder.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: Adding DO2TS.GetDeviceAccountId and minor CR fixes (learning to wrap) 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/device_cloud_policy_manager_chromeos_unittest.cc ('k') | chrome/browser/chromeos/settings/device_oauth2_token_service.h » ('j') | chrome/browser/invalidation/ticl_invalidation_service.h » ('J')
Expand Comments ('e') | Collapse Comments ('c') | Hide Comments ('s')

Index: chrome/browser/chromeos/policy/user_cloud_policy_token_forwarder.cc

diff --git a/chrome/browser/chromeos/policy/user_cloud_policy_token_forwarder.cc b/chrome/browser/chromeos/policy/user_cloud_policy_token_forwarder.cc

index ba98790095c0ad32e944a9074bdc9b00be2b1773..bc6372cf033d4f342f143c9824e4e5d1c705f273 100644

--- a/chrome/browser/chromeos/policy/user_cloud_policy_token_forwarder.cc

+++ b/chrome/browser/chromeos/policy/user_cloud_policy_token_forwarder.cc

@@ -79,7 +79,8 @@ void UserCloudPolicyTokenForwarder::Initialize() {

return;

}

- if (token_service_->RefreshTokenIsAvailable())

+ if (token_service_->RefreshTokenIsAvailable(

+ token_service_->GetPrimaryAccountId()))

RequestAccessToken();

else

token_service_->AddObserver(this);

@@ -88,7 +89,8 @@ void UserCloudPolicyTokenForwarder::Initialize() {

void UserCloudPolicyTokenForwarder::RequestAccessToken() {

OAuth2TokenService::ScopeSet scopes;

scopes.insert(GaiaConstants::kDeviceManagementServiceOAuth);

- request_ = token_service_->StartRequest(scopes, this);

+ request_ = token_service_->StartRequest(

+ token_service_->GetPrimaryAccountId(), scopes, this);

}

} // namespace policy