| 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 21a5a832697683cd6d9bca2f27118621d80fd565..de90dd71e3c6f5a0d8b1b633bdcee1eeb5a24469 100644
|
| --- a/chrome/browser/sync/profile_sync_components_factory_impl.cc
|
| +++ b/chrome/browser/sync/profile_sync_components_factory_impl.cc
|
| @@ -203,6 +203,20 @@ void ProfileSyncComponentsFactoryImpl::RegisterCommonDataTypes(
|
| pss->RegisterDataTypeController(
|
| new UIDataTypeController(syncer::ARTICLES, this, profile_, pss));
|
| }
|
| +
|
| +#if defined(ENABLE_MANAGED_USERS)
|
| + if (ManagedUserService::AreManagedUsersEnabled()) {
|
| + if (profile_->IsManaged()) {
|
| + pss->RegisterDataTypeController(
|
| + new UIDataTypeController(
|
| + syncer::MANAGED_USER_SETTINGS, this, profile_, pss));
|
| + } else {
|
| + pss->RegisterDataTypeController(
|
| + new UIDataTypeController(
|
| + syncer::MANAGED_USERS, this, profile_, pss));
|
| + }
|
| + }
|
| +#endif
|
| }
|
|
|
| void ProfileSyncComponentsFactoryImpl::RegisterDesktopDataTypes(
|
| @@ -279,20 +293,6 @@ void ProfileSyncComponentsFactoryImpl::RegisterDesktopDataTypes(
|
| new UIDataTypeController(syncer::DICTIONARY, this, profile_, pss));
|
| }
|
| #endif
|
| -
|
| -#if defined(ENABLE_MANAGED_USERS)
|
| - if (ManagedUserService::AreManagedUsersEnabled()) {
|
| - if (profile_->IsManaged()) {
|
| - pss->RegisterDataTypeController(
|
| - new UIDataTypeController(
|
| - syncer::MANAGED_USER_SETTINGS, this, profile_, pss));
|
| - } else {
|
| - pss->RegisterDataTypeController(
|
| - new UIDataTypeController(
|
| - syncer::MANAGED_USERS, this, profile_, pss));
|
| - }
|
| - }
|
| -#endif
|
| }
|
|
|
| DataTypeManager* ProfileSyncComponentsFactoryImpl::CreateDataTypeManager(
|
|
|