diff options
| author | bauerb@chromium.org <bauerb@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2013-04-17 12:46:01 +0000 |
|---|---|---|
| committer | bauerb@chromium.org <bauerb@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2013-04-17 12:46:01 +0000 |
| commit | b40e52d752e1bffd81a40cb6a547d849546340ec (patch) | |
| tree | 1f60a6a808bc4d283fc8e7d089ee4d24b13032b0 /sync/tools | |
| parent | be97da1bebcbbc5a53cad0092b4fb104da2af91e (diff) | |
| download | chromium_src-b40e52d752e1bffd81a40cb6a547d849546340ec.zip chromium_src-b40e52d752e1bffd81a40cb6a547d849546340ec.tar.gz chromium_src-b40e52d752e1bffd81a40cb6a547d849546340ec.tar.bz2 | |
Add ManagedUserSettings Sync data type.
This data type should not be visible in the UI, as it will be configured automatically for managed users.
TBR=atwilson@chromium.org
BUG=229383
Review URL: https://codereview.chromium.org/14053004
git-svn-id: svn://svn.chromium.org/chrome/trunk/src@194582 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'sync/tools')
| -rw-r--r-- | sync/tools/testserver/chromiumsync.py | 8 |
1 files changed, 7 insertions, 1 deletions
diff --git a/sync/tools/testserver/chromiumsync.py b/sync/tools/testserver/chromiumsync.py index eecea5c..fbd3c5b 100644 --- a/sync/tools/testserver/chromiumsync.py +++ b/sync/tools/testserver/chromiumsync.py @@ -31,6 +31,7 @@ import extension_specifics_pb2 import favicon_image_specifics_pb2 import favicon_tracking_specifics_pb2 import history_delete_directive_specifics_pb2 +import managed_user_setting_specifics_pb2 import nigori_specifics_pb2 import password_specifics_pb2 import preference_specifics_pb2 @@ -60,6 +61,7 @@ ALL_TYPES = ( EXPERIMENTS, EXTENSIONS, HISTORY_DELETE_DIRECTIVE, + MANAGED_USER_SETTING, NIGORI, PASSWORD, PREFERENCE, @@ -71,7 +73,7 @@ ALL_TYPES = ( TYPED_URL, EXTENSION_SETTINGS, FAVICON_IMAGES, - FAVICON_TRACKING) = range(24) + FAVICON_TRACKING) = range(25) # An enumeration on the frequency at which the server should send errors # to the client. This would be specified by the url that triggers the error. @@ -102,6 +104,7 @@ SYNC_TYPE_TO_DESCRIPTOR = { FAVICON_IMAGES: SYNC_TYPE_FIELDS['favicon_image'], FAVICON_TRACKING: SYNC_TYPE_FIELDS['favicon_tracking'], HISTORY_DELETE_DIRECTIVE: SYNC_TYPE_FIELDS['history_delete_directive'], + MANAGED_USER_SETTING: SYNC_TYPE_FIELDS['managed_user_setting'], NIGORI: SYNC_TYPE_FIELDS['nigori'], PASSWORD: SYNC_TYPE_FIELDS['password'], PREFERENCE: SYNC_TYPE_FIELDS['preference'], @@ -491,6 +494,9 @@ class SyncDataModel(object): name='Favicon Tracking', parent_tag=ROOT_ID, sync_type=FAVICON_TRACKING), + PermanentItem('google_chrome_managed_user_settings', + name='Managed User Settings', + parent_tag=ROOT_ID, sync_type=MANAGED_USER_SETTING), PermanentItem('google_chrome_nigori', name='Nigori', parent_tag=ROOT_ID, sync_type=NIGORI), PermanentItem('google_chrome_passwords', name='Passwords', |