diff options
| author | kalman@chromium.org <kalman@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2011-11-01 01:56:43 +0000 |
|---|---|---|
| committer | kalman@chromium.org <kalman@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2011-11-01 01:56:43 +0000 |
| commit | 27cc73365fd33c212faaf346e42c276daa3b494b (patch) | |
| tree | 8e54461f1890c746f913c053dfcc03492958829f /net/tools | |
| parent | 288c9c8dc1fb8dcb875c40751bb67ec10f2749df (diff) | |
| download | chromium_src-27cc73365fd33c212faaf346e42c276daa3b494b.zip chromium_src-27cc73365fd33c212faaf346e42c276daa3b494b.tar.gz chromium_src-27cc73365fd33c212faaf346e42c276daa3b494b.tar.bz2 | |
Separate the syncing of extension settings and app settings into separate data
types.
This adds syncable::APP_SETTINGS on top of the existing
syncable::EXTENSION_SETTINGS, and restructures code accordingly to accommodate.
This is so they can each be synced independently, and eventually tied to their
respective (EXTENSIONS or APPS) sync settings.
BUG=98488
TEST=ExtensionSettings*
Review URL: http://codereview.chromium.org/8375047
git-svn-id: svn://svn.chromium.org/chrome/trunk/src@108055 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'net/tools')
| -rwxr-xr-x | net/tools/testserver/chromiumsync.py | 12 |
1 files changed, 9 insertions, 3 deletions
diff --git a/net/tools/testserver/chromiumsync.py b/net/tools/testserver/chromiumsync.py index 1559033..9e8cb84 100755 --- a/net/tools/testserver/chromiumsync.py +++ b/net/tools/testserver/chromiumsync.py @@ -18,8 +18,9 @@ import sys import threading import urlparse -import app_specifics_pb2 import app_notification_specifics_pb2 +import app_setting_specifics_pb2 +import app_specifics_pb2 import autofill_specifics_pb2 import bookmark_specifics_pb2 import extension_setting_specifics_pb2 @@ -41,6 +42,7 @@ ALL_TYPES = ( TOP_LEVEL, # The type of the 'Google Chrome' folder. APPS, APP_NOTIFICATION, + APP_SETTINGS, AUTOFILL, AUTOFILL_PROFILE, BOOKMARK, @@ -52,7 +54,7 @@ ALL_TYPES = ( SESSION, THEME, TYPED_URL, - EXTENSION_SETTINGS) = range(15) + EXTENSION_SETTINGS) = range(16) # Well-known server tag of the top level 'Google Chrome' folder. TOP_LEVEL_FOLDER_TAG = 'google_chrome' @@ -60,8 +62,9 @@ TOP_LEVEL_FOLDER_TAG = 'google_chrome' # Given a sync type from ALL_TYPES, find the extension token corresponding # to that datatype. Note that TOP_LEVEL has no such token. SYNC_TYPE_TO_EXTENSION = { - APPS: app_specifics_pb2.app, APP_NOTIFICATION: app_notification_specifics_pb2.app_notification, + APP_SETTINGS: app_setting_specifics_pb2.app_setting, + APPS: app_specifics_pb2.app, AUTOFILL: autofill_specifics_pb2.autofill, AUTOFILL_PROFILE: autofill_specifics_pb2.autofill_profile, BOOKMARK: bookmark_specifics_pb2.bookmark, @@ -394,6 +397,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_app_settings', + name='App Settings', + parent_tag='google_chrome', sync_type=APP_SETTINGS), PermanentItem('google_chrome_extension_settings', name='Extension Settings', parent_tag='google_chrome', sync_type=EXTENSION_SETTINGS), |