chrome/browser/prefs/pref_service_syncable_builder.cc - Issue 11741003: Remove PrefServiceSimple, replacing it with PrefService and PrefRegistrySimple.

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/prefs/pref_service_syncable_builder.cc

Issue 11741003: Remove PrefServiceSimple, replacing it with PrefService and PrefRegistrySimple. (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src

Patch Set: Switch to desired interfaces. Created 7 years, 11 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

« chrome/browser/prefs/pref_service_syncable.cc ('K') | « chrome/browser/prefs/pref_service_syncable.cc ('k') | chrome/browser/prefs/pref_service_unittest.cc » ('j') | chrome/browser/prefs/pref_value_store.h » ('J')
Expand Comments ('e') | Collapse Comments ('c') | Hide Comments ('s')

Index: chrome/browser/prefs/pref_service_syncable_builder.cc

diff --git a/chrome/browser/prefs/pref_service_syncable_builder.cc b/chrome/browser/prefs/pref_service_syncable_builder.cc

index 4c1327751800205c3089cea10ab37079e2f44251..cd46da2454bd14e210d3cf88b6a0da52ada652af 100644

--- a/chrome/browser/prefs/pref_service_syncable_builder.cc

+++ b/chrome/browser/prefs/pref_service_syncable_builder.cc

@@ -41,7 +41,7 @@ PrefServiceSyncableBuilder::WithCommandLine(CommandLine* command_line) {

}

PrefServiceSyncable* PrefServiceSyncableBuilder::CreateSyncable() {

- DefaultPrefStore* default_pref_store = new DefaultPrefStore();

+ PrefRegistry* pref_registry = new PrefRegistry();

PrefNotifierImpl* pref_notifier = new PrefNotifierImpl();

PrefServiceSyncable* pref_service = new PrefServiceSyncable(

pref_notifier,

@@ -51,10 +51,10 @@ PrefServiceSyncable* PrefServiceSyncableBuilder::CreateSyncable() {

command_line_prefs_.get(),

user_prefs_.get(),

recommended_prefs_.get(),

- default_pref_store,

+ pref_registry,

pref_notifier),

user_prefs_.get(),

- default_pref_store,

+ make_scoped_ptr(pref_registry).Pass(),

read_error_callback_,

async_);

ResetDefaultState();