chrome/browser/content_settings/content_settings_pref_provider.cc - Issue 11570009: Split PrefService into PrefService, PrefServiceSimple and PrefServiceSyncable.

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 11570009: Split PrefService into PrefService, PrefServiceSimple and PrefServiceSyncable. (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src

Patch Set: Merge to head again, previous had unrelated broken win_rel test. Created 8 years 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_pref_provider.h ('k') | chrome/browser/content_settings/content_settings_pref_provider_unittest.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 6c5e1be4848ffaba535d52604d4831fe0b31c158..ddf6efc426dc1e03168140dbb90c07ec5e245a82 100644

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

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

@@ -71,13 +71,13 @@ namespace content_settings {

// static

-void PrefProvider::RegisterUserPrefs(PrefService* prefs) {

+void PrefProvider::RegisterUserPrefs(PrefServiceSyncable* prefs) {

prefs->RegisterIntegerPref(

prefs::kContentSettingsVersion,

ContentSettingsPattern::kContentSettingsPatternVersion,

- PrefService::UNSYNCABLE_PREF);

+ PrefServiceSyncable::UNSYNCABLE_PREF);

prefs->RegisterDictionaryPref(prefs::kContentSettingsPatternPairs,

- PrefService::SYNCABLE_PREF);

+ PrefServiceSyncable::SYNCABLE_PREF);

}

PrefProvider::PrefProvider(PrefService* prefs,