chrome/browser/sync/profile_sync_components_factory_impl.cc - Issue 23376002: Move ManagedModePolicyProvider functionality to ManagedUserSettingsService.

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_components_factory_impl.cc

Issue 23376002: Move ManagedModePolicyProvider functionality to ManagedUserSettingsService. (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src

Patch Set: fix 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

« chrome/browser/prefs/chrome_pref_service_factory.cc ('K') | « chrome/browser/profiles/profile_impl.cc ('k') | chrome/browser/sync/test/integration/single_client_managed_user_settings_sync_test.cc » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Hide Comments ('s')

Index: chrome/browser/sync/profile_sync_components_factory_impl.cc

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

index e8e8702106464f259b5b0bf7c9e8cad500c38e6c..c8f8a3a9165f139b83d0370df5c3d6d7771b43d3 100644

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

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

@@ -62,11 +62,10 @@

#if defined(ENABLE_MANAGED_USERS)

#include "chrome/browser/managed_mode/managed_user_service.h"

+#include "chrome/browser/managed_mode/managed_user_settings_service.h"

+#include "chrome/browser/managed_mode/managed_user_settings_service_factory.h"

#include "chrome/browser/managed_mode/managed_user_sync_service.h"

#include "chrome/browser/managed_mode/managed_user_sync_service_factory.h"

-#include "chrome/browser/policy/managed_mode_policy_provider.h"

-#include "chrome/browser/policy/profile_policy_connector.h"

-#include "chrome/browser/policy/profile_policy_connector_factory.h"

#endif

#if !defined(OS_ANDROID)

@@ -392,8 +391,8 @@ base::WeakPtr<syncer::SyncableService> ProfileSyncComponentsFactoryImpl::

}

#if defined(ENABLE_MANAGED_USERS)

case syncer::MANAGED_USER_SETTINGS:

- return policy::ProfilePolicyConnectorFactory::GetForProfile(profile_)->

- managed_mode_policy_provider()->AsWeakPtr();

+ return ManagedUserSettingsServiceFactory::GetForProfile(profile_)->

+ AsWeakPtr();

case syncer::MANAGED_USERS:

return ManagedUserSyncServiceFactory::GetForProfile(profile_)->

AsWeakPtr();