components/content_settings/core/browser/content_settings_pref_provider.cc - Issue 1102733002: Remove most occurences of PrefRegistrySyncable::UNSYNCABLE_PREF

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: components/content_settings/core/browser/content_settings_pref_provider.cc

Issue 1102733002: Remove most occurences of PrefRegistrySyncable::UNSYNCABLE_PREF (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@prefs-add-reg-funcs

Patch Set: Created 5 years, 8 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 | « components/content_settings/core/browser/content_settings_policy_provider.cc ('k') | components/content_settings/core/browser/host_content_settings_map.cc » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Hide Comments ('s')

Index: components/content_settings/core/browser/content_settings_pref_provider.cc

diff --git a/components/content_settings/core/browser/content_settings_pref_provider.cc b/components/content_settings/core/browser/content_settings_pref_provider.cc

index 6f7c006238bba200f07555d6340f1db27024a5f0..0b5635528c7cd5b32f1fc6916cb989e681f50520 100644

--- a/components/content_settings/core/browser/content_settings_pref_provider.cc

+++ b/components/content_settings/core/browser/content_settings_pref_provider.cc

@@ -112,15 +112,12 @@ void PrefProvider::RegisterProfilePrefs(

user_prefs::PrefRegistrySyncable* registry) {

registry->RegisterIntegerPref(

prefs::kContentSettingsVersion,

- ContentSettingsPattern::kContentSettingsPatternVersion,

- user_prefs::PrefRegistrySyncable::UNSYNCABLE_PREF);

+ ContentSettingsPattern::kContentSettingsPatternVersion);

registry->RegisterDictionaryPref(

prefs::kContentSettingsPatternPairs,

user_prefs::PrefRegistrySyncable::SYNCABLE_PREF);

- registry->RegisterBooleanPref(

- prefs::kMigratedContentSettingsPatternPairs,

- false,

- user_prefs::PrefRegistrySyncable::UNSYNCABLE_PREF);

+ registry->RegisterBooleanPref(prefs::kMigratedContentSettingsPatternPairs,

+ false);

for (int i = 0; i < CONTENT_SETTINGS_NUM_TYPES; ++i) {

registry->RegisterDictionaryPref(