chrome/browser/background/background_contents_service_factory.cc - Issue 12079097: Introduce PrefRegistrySyncable, simplifying 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/background/background_contents_service_factory.cc

Issue 12079097: Introduce PrefRegistrySyncable, simplifying PrefServiceSyncable. (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src

Patch Set: Merge to head again; base::File changes conflicted. Created 7 years, 10 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:

Index: chrome/browser/background/background_contents_service_factory.cc

diff --git a/chrome/browser/background/background_contents_service_factory.cc b/chrome/browser/background/background_contents_service_factory.cc

index 3043efe9af0b39b1773e167b41eabac901e9a0c4..12670b1e28e516b161d65661aa9c04379e3b715f 100644

--- a/chrome/browser/background/background_contents_service_factory.cc

+++ b/chrome/browser/background/background_contents_service_factory.cc

@@ -6,6 +6,7 @@

#include "base/command_line.h"

#include "chrome/browser/background/background_contents_service.h"

+#include "chrome/browser/prefs/pref_registry_syncable.h"

#include "chrome/browser/prefs/pref_service.h"

#include "chrome/browser/profiles/profile.h"

#include "chrome/browser/profiles/profile_dependency_manager.h"

@@ -39,9 +40,9 @@ ProfileKeyedService* BackgroundContentsServiceFactory::BuildServiceInstanceFor(

}

void BackgroundContentsServiceFactory::RegisterUserPrefs(

- PrefServiceSyncable* user_prefs) {

+ PrefRegistrySyncable* user_prefs) {

user_prefs->RegisterDictionaryPref(prefs::kRegisteredBackgroundContents,

- PrefServiceSyncable::UNSYNCABLE_PREF);

+ PrefRegistrySyncable::UNSYNCABLE_PREF);

}

bool