summaryrefslogtreecommitdiffstats
path: root/net/tools
diff options
context:
space:
mode:
authorakalin@chromium.org <akalin@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98>2011-09-21 19:07:13 +0000
committerakalin@chromium.org <akalin@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98>2011-09-21 19:07:13 +0000
commitadfc54690d913542f0cdf0f4ea1339ba1670df24 (patch)
tree4f20cda44225f5384193bba9933e3676bff6047c /net/tools
parent02896a8fd669ced03e8a76edfbb423c858eafc53 (diff)
downloadchromium_src-adfc54690d913542f0cdf0f4ea1339ba1670df24.zip
chromium_src-adfc54690d913542f0cdf0f4ea1339ba1670df24.tar.gz
chromium_src-adfc54690d913542f0cdf0f4ea1339ba1670df24.tar.bz2
Enable sync for the settings from the Extension Settings API.
Original patch by kalman@chromium.org. BUG=94575 TEST=unit tests included TBR=kalman@chromium.org Review URL: http://codereview.chromium.org/7977018 git-svn-id: svn://svn.chromium.org/chrome/trunk/src@102140 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'net/tools')
-rwxr-xr-xnet/tools/testserver/chromiumsync.py8
1 files changed, 7 insertions, 1 deletions
diff --git a/net/tools/testserver/chromiumsync.py b/net/tools/testserver/chromiumsync.py
index a8a939c..e1c049c 100755
--- a/net/tools/testserver/chromiumsync.py
+++ b/net/tools/testserver/chromiumsync.py
@@ -21,6 +21,7 @@ import urlparse
import app_specifics_pb2
import autofill_specifics_pb2
import bookmark_specifics_pb2
+import extension_setting_specifics_pb2
import extension_specifics_pb2
import nigori_specifics_pb2
import password_specifics_pb2
@@ -48,7 +49,8 @@ ALL_TYPES = (
SEARCH_ENGINE,
SESSION,
THEME,
- TYPED_URL) = range(13)
+ TYPED_URL,
+ EXTENSION_SETTINGS) = range(14)
# Well-known server tag of the top level 'Google Chrome' folder.
TOP_LEVEL_FOLDER_TAG = 'google_chrome'
@@ -60,6 +62,7 @@ SYNC_TYPE_TO_EXTENSION = {
AUTOFILL: autofill_specifics_pb2.autofill,
AUTOFILL_PROFILE: autofill_specifics_pb2.autofill_profile,
BOOKMARK: bookmark_specifics_pb2.bookmark,
+ EXTENSION_SETTINGS: extension_setting_specifics_pb2.extension_setting,
EXTENSIONS: extension_specifics_pb2.extension,
NIGORI: nigori_specifics_pb2.nigori,
PASSWORD: password_specifics_pb2.password,
@@ -384,6 +387,9 @@ class SyncDataModel(object):
parent_tag='google_chrome', sync_type=AUTOFILL),
PermanentItem('google_chrome_autofill_profiles', name='Autofill Profiles',
parent_tag='google_chrome', sync_type=AUTOFILL_PROFILE),
+ PermanentItem('google_chrome_extension_settings',
+ name='Extension Settings',
+ parent_tag='google_chrome', sync_type=EXTENSION_SETTINGS),
PermanentItem('google_chrome_extensions', name='Extensions',
parent_tag='google_chrome', sync_type=EXTENSIONS),
PermanentItem('google_chrome_passwords', name='Passwords',