chrome/browser/sync/profile_sync_service_factory.cc - Issue 335273005: Rename "managed (mode|user)" to "supervised user" (part 3)

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/sync/profile_sync_service_factory.cc

Issue 335273005: Rename "managed (mode|user)" to "supervised user" (part 3) (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src

Patch Set: rebase Created 6 years, 6 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:

Index: chrome/browser/sync/profile_sync_service_factory.cc

diff --git a/chrome/browser/sync/profile_sync_service_factory.cc b/chrome/browser/sync/profile_sync_service_factory.cc

index 4a9f487a49db733e1b7d8a5945cdabae2dc83dd1..60f72b51cbf7bb3fb1b4ab8d50fee6b2fdbc4343 100644

--- a/chrome/browser/sync/profile_sync_service_factory.cc

+++ b/chrome/browser/sync/profile_sync_service_factory.cc

@@ -21,10 +21,10 @@

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

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

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

-#include "chrome/browser/sync/managed_user_signin_manager_wrapper.h"

#include "chrome/browser/sync/profile_sync_components_factory_impl.h"

#include "chrome/browser/sync/profile_sync_service.h"

#include "chrome/browser/sync/startup_controller.h"

+#include "chrome/browser/sync/supervised_user_signin_manager_wrapper.h"

#include "chrome/browser/themes/theme_service_factory.h"

#include "chrome/browser/ui/global_error/global_error_service_factory.h"

#include "chrome/browser/webdata/web_data_service_factory.h"

@@ -105,8 +105,8 @@ KeyedService* ProfileSyncServiceFactory::BuildServiceInstanceFor(

const GURL sync_service_url =

ProfileSyncService::GetSyncServiceURL(*CommandLine::ForCurrentProcess());

- scoped_ptr<ManagedUserSigninManagerWrapper> signin_wrapper(

- new ManagedUserSigninManagerWrapper(profile, signin));

+ scoped_ptr<SupervisedUserSigninManagerWrapper> signin_wrapper(

+ new SupervisedUserSigninManagerWrapper(profile, signin));

std::string account_id = signin_wrapper->GetAccountIdToUse();

OAuth2TokenService::ScopeSet scope_set;

scope_set.insert(signin_wrapper->GetSyncScopeToUse());