summaryrefslogtreecommitdiffstats
path: root/chrome/common
diff options
context:
space:
mode:
authornick@chromium.org <nick@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98>2010-04-02 02:58:05 +0000
committernick@chromium.org <nick@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98>2010-04-02 02:58:05 +0000
commita1c2aef665b4abc30bbd6e2f8af5d5e68fc49eb4 (patch)
tree3cb23a152fb2363d24b3f8e6218a4e0349df9506 /chrome/common
parentd2cf4787e75a7f0f431dede5a86e77f275148e1b (diff)
downloadchromium_src-a1c2aef665b4abc30bbd6e2f8af5d5e68fc49eb4.zip
chromium_src-a1c2aef665b4abc30bbd6e2f8af5d5e68fc49eb4.tar.gz
chromium_src-a1c2aef665b4abc30bbd6e2f8af5d5e68fc49eb4.tar.bz2
Move enable/disable storage to prefs.
The ProfileSyncService will manage the enabled/disabled types. Remove CustomizeSyncWindowView's DataTypeManager dependency; it should really just be operating on the preferences via the ProfileSyncService. Clarify the difference between types being enabled (meaning the user wants to sync them) versus being advertisable (meaning we support the datatype, and advertise that the user has the option of syncing it). BUG=34209,38340 TEST=After syncing, open the options dialog and recustomize your options. Verify that the enabled types from the wizard match the initial state of the options window. After changing the options and hitting "accept", observe that a breakpoint in DTM::Configure gets triggered, with exactly the new configuration set. Verify that the preferences are preserved on restart, as well as across Stop Syncing / Start Syncing. Review URL: http://codereview.chromium.org/1556009 git-svn-id: svn://svn.chromium.org/chrome/trunk/src@43440 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'chrome/common')
-rw-r--r--chrome/common/pref_names.cc1
-rw-r--r--chrome/common/pref_names.h1
2 files changed, 2 insertions, 0 deletions
diff --git a/chrome/common/pref_names.cc b/chrome/common/pref_names.cc
index 0806bca..8ae28c7 100644
--- a/chrome/common/pref_names.cc
+++ b/chrome/common/pref_names.cc
@@ -696,6 +696,7 @@ const wchar_t kSyncBookmarks[] = L"sync.bookmarks";
const wchar_t kSyncPreferences[] = L"sync.preferences";
const wchar_t kSyncAutofill[] = L"sync.autofill";
const wchar_t kSyncThemes[] = L"sync.themes";
+const wchar_t kSyncTypedUrls[] = L"sync.typed_urls";
// Whether sync auth was bootstrapped for Chrome OS.
const wchar_t kSyncBootstrappedAuth[] = L"sync.bootstrapped_auth";
diff --git a/chrome/common/pref_names.h b/chrome/common/pref_names.h
index 5de4f0f..d1ea830 100644
--- a/chrome/common/pref_names.h
+++ b/chrome/common/pref_names.h
@@ -255,6 +255,7 @@ extern const wchar_t kSyncBookmarks[];
extern const wchar_t kSyncPreferences[];
extern const wchar_t kSyncAutofill[];
extern const wchar_t kSyncThemes[];
+extern const wchar_t kSyncTypedUrls[];
extern const wchar_t kSyncBootstrappedAuth[];
extern const wchar_t kWebAppCreateOnDesktop[];