Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(2759)

Unified Diff: chrome/browser/sync/profile_sync_components_factory_impl.cc

Issue 123293003: Add ManagedUserSharedSettingsService. (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: comment Created 6 years, 11 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
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 f8b5eb4c0748b09592be3bb11ccb9e00d07f4e1b..34ae181f0b7195d8a71cea88a59f3eb6b8ff3731 100644
--- a/chrome/browser/sync/profile_sync_components_factory_impl.cc
+++ b/chrome/browser/sync/profile_sync_components_factory_impl.cc
@@ -72,6 +72,8 @@
#if defined(ENABLE_MANAGED_USERS)
#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_shared_settings_service.h"
+#include "chrome/browser/managed_mode/managed_user_shared_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"
#endif
@@ -227,6 +229,9 @@ void ProfileSyncComponentsFactoryImpl::RegisterCommonDataTypes(
new UIDataTypeController(
syncer::MANAGED_USERS, this, profile_, pss));
}
+ pss->RegisterDataTypeController(
+ new UIDataTypeController(
+ syncer::MANAGED_USER_SHARED_SETTINGS, this, profile_, pss));
#endif
}
@@ -434,6 +439,9 @@ base::WeakPtr<syncer::SyncableService> ProfileSyncComponentsFactoryImpl::
case syncer::MANAGED_USERS:
return ManagedUserSyncServiceFactory::GetForProfile(profile_)->
AsWeakPtr();
+ case syncer::MANAGED_USER_SHARED_SETTINGS:
+ return ManagedUserSharedSettingsServiceFactory::GetForBrowserContext(
+ profile_)->AsWeakPtr();
#endif
case syncer::ARTICLES: {
dom_distiller::DomDistillerService* service =
« no previous file with comments | « chrome/browser/prefs/browser_prefs.cc ('k') | chrome/browser/sync/profile_sync_components_factory_impl_unittest.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698