summaryrefslogtreecommitdiffstats
path: root/chrome/browser/prefs/pref_model_associator.cc
diff options
context:
space:
mode:
authormnaganov@chromium.org <mnaganov@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98>2011-12-29 10:35:49 +0000
committermnaganov@chromium.org <mnaganov@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98>2011-12-29 10:35:49 +0000
commit7a5f593e856ea4a0733a8d3665b0ca5ea3410fcb (patch)
tree846e0e2898ea5fac9c772c584ecf5d516c54ce36 /chrome/browser/prefs/pref_model_associator.cc
parentb7afd53b3c20c8229b3f93a4ecc6bc9aecf6f2cb (diff)
downloadchromium_src-7a5f593e856ea4a0733a8d3665b0ca5ea3410fcb.zip
chromium_src-7a5f593e856ea4a0733a8d3665b0ca5ea3410fcb.tar.gz
chromium_src-7a5f593e856ea4a0733a8d3665b0ca5ea3410fcb.tar.bz2
Add more per-tab preferences.
intl.global.charset_default webkit.webprefs.global.standard_font_family webkit.webprefs.global.fixed_font_family webkit.webprefs.global.serif_font_family webkit.webprefs.global.sansserif_font_family webkit.webprefs.global.cursive_font_family webkit.webprefs.global.fantasy_font_family webkit.webprefs.global.default_font_size webkit.webprefs.global.default_fixed_font_size webkit.webprefs.global.minimum_font_size webkit.webprefs.global.minimum_logical_font_size webkit.webprefs.global.javascript_can_open_windows_automatically webkit.webprefs.global.loads_images_automatically webkit.webprefs.global.plugins_enabled BUG=105537 TEST=PrefsTabHelperTest*,PrefsTabHelperBrowserTest* For files that has only prefs names changes and require OWNERS approval: TBR=erikwright@chromium.org,gene@chromium.org,csilv@chromium.org,atwilson@chromium.org,mirandac@chromium.org Review URL: http://codereview.chromium.org/8879016 git-svn-id: svn://svn.chromium.org/chrome/trunk/src@115955 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'chrome/browser/prefs/pref_model_associator.cc')
-rw-r--r--chrome/browser/prefs/pref_model_associator.cc5
1 files changed, 5 insertions, 0 deletions
diff --git a/chrome/browser/prefs/pref_model_associator.cc b/chrome/browser/prefs/pref_model_associator.cc
index 4f06c19..45d4332 100644
--- a/chrome/browser/prefs/pref_model_associator.cc
+++ b/chrome/browser/prefs/pref_model_associator.cc
@@ -376,6 +376,11 @@ bool PrefModelAssociator::IsPrefRegistered(const char* name) {
return registered_preferences_.count(name) > 0;
}
+void PrefModelAssociator::UnregisterPref(const char* name) {
+ DCHECK(synced_preferences_.count(name) == 0);
+ registered_preferences_.erase(name);
+}
+
void PrefModelAssociator::ProcessPrefChange(const std::string& name) {
if (processing_syncer_changes_)
return; // These are changes originating from us, ignore.