chrome/browser/custom_handlers/protocol_handler_registry.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/custom_handlers/protocol_handler_registry.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/custom_handlers/protocol_handler_registry.h ('k') | chrome/browser/custom_handlers/protocol_handler_registry_unittest.cc » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Hide Comments ('s')

Index: chrome/browser/custom_handlers/protocol_handler_registry.cc

diff --git a/chrome/browser/custom_handlers/protocol_handler_registry.cc b/chrome/browser/custom_handlers/protocol_handler_registry.cc

index a95fd1c285665acdca3f8715d87f2ed593ded451..bab8c445560eba9b7b4e95bf914fa86c8dd9299c 100644

--- a/chrome/browser/custom_handlers/protocol_handler_registry.cc

+++ b/chrome/browser/custom_handlers/protocol_handler_registry.cc

@@ -708,13 +708,14 @@ void ProtocolHandlerRegistry::Shutdown() {

}

// static

-void ProtocolHandlerRegistry::RegisterPrefs(PrefService* pref_service) {

+void ProtocolHandlerRegistry::RegisterUserPrefs(

+ PrefServiceSyncable* pref_service) {

pref_service->RegisterListPref(prefs::kRegisteredProtocolHandlers,

- PrefService::UNSYNCABLE_PREF);

+ PrefServiceSyncable::UNSYNCABLE_PREF);

pref_service->RegisterListPref(prefs::kIgnoredProtocolHandlers,

- PrefService::UNSYNCABLE_PREF);

+ PrefServiceSyncable::UNSYNCABLE_PREF);

pref_service->RegisterBooleanPref(prefs::kCustomHandlersEnabled, true,

- PrefService::UNSYNCABLE_PREF);

+ PrefServiceSyncable::UNSYNCABLE_PREF);

}

ProtocolHandlerRegistry::~ProtocolHandlerRegistry() {