chrome/browser/content_settings/content_settings_pref_provider.cc - Issue 6905044: Refactor preference syncing.

Keyboard Shortcuts

	File
u :	up to issue
j / k :	jump to file after / before current file
J / K :	jump to next file with a comment after / before current file
	Side-by-side diff
i :	toggle intra-line diffs
e :	expand all comments
c :	collapse all comments
s :	toggle showing all comments
n / p :	next / previous diff chunk or comment
N / P :	next / previous comment
<Up> / <Down> :	next / previous line

	Issue
u :	up to list of issues
j / k :	jump to patch after / before current patch
o / <Enter> :	open current patch in side-by-side view
i :	open current patch in unified diff view

	Issue List
j / k :	jump to issue after / before current issue
o / <Enter> :	open current issue

Unified Diff: chrome/browser/content_settings/content_settings_pref_provider.cc

Issue 6905044: Refactor preference syncing. (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src

Patch Set: Really fix. And rebase Created 9 years, 7 months ago

Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.

Jump to:

View side-by-side diff with in-line comments

Download patch

« no previous file with comments | « chrome/browser/content_settings/content_settings_policy_provider.cc ('k') | chrome/browser/content_settings/host_content_settings_map.cc » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Hide Comments ('s')

Index: chrome/browser/content_settings/content_settings_pref_provider.cc

diff --git a/chrome/browser/content_settings/content_settings_pref_provider.cc b/chrome/browser/content_settings/content_settings_pref_provider.cc

index acf4e91fbf74cb4c791c409bddb30a5b1685d21d..467d502d8758ffdb2995c61b00cd68bd962ddef9 100644

--- a/chrome/browser/content_settings/content_settings_pref_provider.cc

+++ b/chrome/browser/content_settings/content_settings_pref_provider.cc

@@ -313,12 +313,14 @@ void PrefDefaultProvider::RegisterUserPrefs(PrefService* prefs) {

DictionaryValue* default_content_settings = new DictionaryValue();

SetDefaultContentSettings(default_content_settings);

prefs->RegisterDictionaryPref(prefs::kDefaultContentSettings,

- default_content_settings);

+ default_content_settings,

+ PrefService::SYNCABLE_PREF);

// Obsolete prefs, for migrations:

prefs->RegisterIntegerPref(

prefs::kDesktopNotificationDefaultContentSetting,

- kDefaultSettings[CONTENT_SETTINGS_TYPE_NOTIFICATIONS]);

+ kDefaultSettings[CONTENT_SETTINGS_TYPE_NOTIFICATIONS],

+ PrefService::SYNCABLE_PREF);

}

// ////////////////////////////////////////////////////////////////////////////

@@ -327,13 +329,18 @@ void PrefDefaultProvider::RegisterUserPrefs(PrefService* prefs) {

// static

void PrefProvider::RegisterUserPrefs(PrefService* prefs) {

- prefs->RegisterIntegerPref(prefs::kContentSettingsVersion,

- ContentSettingsPattern::kContentSettingsPatternVersion);

- prefs->RegisterDictionaryPref(prefs::kContentSettingsPatterns);

+ prefs->RegisterIntegerPref(

+ prefs::kContentSettingsVersion,

+ ContentSettingsPattern::kContentSettingsPatternVersion,

+ PrefService::UNSYNCABLE_PREF);

+ prefs->RegisterDictionaryPref(prefs::kContentSettingsPatterns,

+ PrefService::SYNCABLE_PREF);

// Obsolete prefs, for migration:

- prefs->RegisterListPref(prefs::kPopupWhitelistedHosts);

- prefs->RegisterDictionaryPref(prefs::kPerHostContentSettings);

+ prefs->RegisterListPref(prefs::kPopupWhitelistedHosts,

+ PrefService::UNSYNCABLE_PREF);

+ prefs->RegisterDictionaryPref(prefs::kPerHostContentSettings,

+ PrefService::UNSYNCABLE_PREF);

}

PrefProvider::PrefProvider(Profile* profile)