summaryrefslogtreecommitdiffstats
path: root/chrome/browser/debugger
diff options
context:
space:
mode:
authorzea@chromium.org <zea@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98>2011-05-09 06:19:16 +0000
committerzea@chromium.org <zea@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98>2011-05-09 06:19:16 +0000
commitd36f941bbea3e9fa6d13829626a1911008b37f17 (patch)
treed7b3e6a109c39557bd30154407c000f0bb730339 /chrome/browser/debugger
parent838dd914a5bd6a049915984c9619d69ef160b82e (diff)
downloadchromium_src-d36f941bbea3e9fa6d13829626a1911008b37f17.zip
chromium_src-d36f941bbea3e9fa6d13829626a1911008b37f17.tar.gz
chromium_src-d36f941bbea3e9fa6d13829626a1911008b37f17.tar.bz2
Refactor preference syncing.
The following are the primary changes: 1. Whenever a profile preference is registered, it must specify whether that preference should be synced or not. Local state preferences do not require this. However, we DCHECK that local state preferences are in fact registered to the local state. 2. We've created a new sync model associator interface, which all datatypes will eventually implement. This new model associator is designed to be decoupled from much of the sync internals, and to be owned by the chrome service being synced. It also implements most of the functionality previous handled by the change processor. 3. The PrefService now owns its sync model associator (pref_model_associator), which partially implements the new model associator functionality. Further work will be done to remove the use of sync transactions from the model associator, as well as to migrate other datatypes. BUG=76232 TEST= Review URL: http://codereview.chromium.org/6905044 git-svn-id: svn://svn.chromium.org/chrome/trunk/src@84603 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'chrome/browser/debugger')
-rw-r--r--chrome/browser/debugger/devtools_manager.cc4
-rw-r--r--chrome/browser/debugger/devtools_window.cc2
2 files changed, 4 insertions, 2 deletions
diff --git a/chrome/browser/debugger/devtools_manager.cc b/chrome/browser/debugger/devtools_manager.cc
index 61dec4b..34e935d 100644
--- a/chrome/browser/debugger/devtools_manager.cc
+++ b/chrome/browser/debugger/devtools_manager.cc
@@ -36,7 +36,9 @@ DevToolsManager* DevToolsManager::GetInstance() {
// static
void DevToolsManager::RegisterUserPrefs(PrefService* prefs) {
- prefs->RegisterBooleanPref(prefs::kDevToolsOpenDocked, true);
+ prefs->RegisterBooleanPref(prefs::kDevToolsOpenDocked,
+ true,
+ PrefService::UNSYNCABLE_PREF);
}
DevToolsManager::DevToolsManager()
diff --git a/chrome/browser/debugger/devtools_window.cc b/chrome/browser/debugger/devtools_window.cc
index 8145ff7..f824768 100644
--- a/chrome/browser/debugger/devtools_window.cc
+++ b/chrome/browser/debugger/devtools_window.cc
@@ -226,7 +226,7 @@ void DevToolsWindow::CreateDevToolsBrowser() {
PrefService* prefs = profile_->GetPrefs();
if (!prefs->FindPreference(wp_key.c_str())) {
- prefs->RegisterDictionaryPref(wp_key.c_str());
+ prefs->RegisterDictionaryPref(wp_key.c_str(), PrefService::UNSYNCABLE_PREF);
}
const DictionaryValue* wp_pref = prefs->GetDictionary(wp_key.c_str());