Commit 98746fb8 authored by bauerb@chromium.org's avatar bauerb@chromium.org

[Supervised users] Disable syncing shared settings for now.

BUG=333179

Review URL: https://codereview.chromium.org/133623002

git-svn-id: svn://svn.chromium.org/chrome/trunk/src@244317 0039d316-1c4b-4281-b951-d872f2087c98
parent c1b31750
...@@ -229,9 +229,11 @@ void ProfileSyncComponentsFactoryImpl::RegisterCommonDataTypes( ...@@ -229,9 +229,11 @@ void ProfileSyncComponentsFactoryImpl::RegisterCommonDataTypes(
new UIDataTypeController( new UIDataTypeController(
syncer::MANAGED_USERS, this, profile_, pss)); syncer::MANAGED_USERS, this, profile_, pss));
} }
pss->RegisterDataTypeController( // TODO(bauerb): Enable once the Sync server has been updated to know about
new UIDataTypeController( // this data type.
syncer::MANAGED_USER_SHARED_SETTINGS, this, profile_, pss)); // pss->RegisterDataTypeController(
// new UIDataTypeController(
// syncer::MANAGED_USER_SHARED_SETTINGS, this, profile_, pss));
#endif #endif
} }
......
...@@ -59,7 +59,9 @@ class ProfileSyncComponentsFactoryImplTest : public testing::Test { ...@@ -59,7 +59,9 @@ class ProfileSyncComponentsFactoryImplTest : public testing::Test {
datatypes.push_back(syncer::FAVICON_IMAGES); datatypes.push_back(syncer::FAVICON_IMAGES);
datatypes.push_back(syncer::SYNCED_NOTIFICATIONS); datatypes.push_back(syncer::SYNCED_NOTIFICATIONS);
datatypes.push_back(syncer::MANAGED_USERS); datatypes.push_back(syncer::MANAGED_USERS);
datatypes.push_back(syncer::MANAGED_USER_SHARED_SETTINGS); // TODO(bauerb): Enable once the Sync server has been updated to know about
// this data type.
// datatypes.push_back(syncer::MANAGED_USER_SHARED_SETTINGS);
return datatypes; return datatypes;
} }
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment