chrome/browser/managed_mode/managed_user_registration_utility.cc - Issue 165543004: Revert of Replace PO2TS::GetPrimaryAccountId() with SMB::GetAuthenticatedAccountId.

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/managed_mode/managed_user_registration_utility.cc

Issue 165543004: Revert of Replace PO2TS::GetPrimaryAccountId() with SMB::GetAuthenticatedAccountId. (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src

Patch Set: Created 6 years, 10 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/invalidation/ticl_invalidation_service.cc ('k') | chrome/browser/policy/cloud/user_policy_signin_service.h » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Hide Comments ('s')

Index: chrome/browser/managed_mode/managed_user_registration_utility.cc

diff --git a/chrome/browser/managed_mode/managed_user_registration_utility.cc b/chrome/browser/managed_mode/managed_user_registration_utility.cc

index 34b02f849fc1058a9c1ca2379a17c4e8c9a1fd60..cf26a62783d6d0f2f96bbaf3240c48009222fe71 100644

--- a/chrome/browser/managed_mode/managed_user_registration_utility.cc

+++ b/chrome/browser/managed_mode/managed_user_registration_utility.cc

@@ -20,8 +20,6 @@

#include "chrome/browser/profiles/profile.h"

#include "chrome/browser/signin/profile_oauth2_token_service.h"

#include "chrome/browser/signin/profile_oauth2_token_service_factory.h"

-#include "chrome/browser/signin/signin_manager.h"

-#include "chrome/browser/signin/signin_manager_factory.h"

#include "chrome/browser/sync/glue/device_info.h"

#include "chrome/common/chrome_switches.h"

#include "chrome/common/pref_names.h"

@@ -143,12 +141,10 @@

ProfileOAuth2TokenService* token_service =

ProfileOAuth2TokenServiceFactory::GetForProfile(profile);

- SigninManagerBase* signin_manager =

- SigninManagerFactory::GetForProfile(profile);

scoped_ptr<ManagedUserRefreshTokenFetcher> token_fetcher =

ManagedUserRefreshTokenFetcher::Create(

token_service,

- signin_manager->GetAuthenticatedAccountId(),

+ token_service->GetPrimaryAccountId(),

profile->GetRequestContext());

ManagedUserSyncService* managed_user_sync_service =

ManagedUserSyncServiceFactory::GetForProfile(profile);