chrome/browser/custom_handlers/protocol_handler_registry.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/custom_handlers/protocol_handler_registry.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/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 5d8ad6ae2da2b3c3a12fb45c80aa3fddcdb9cb67..be39398bf7d39edf9f766fa5ce3728cbed8b01db 100644

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

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

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

#include "base/logging.h"

#include "chrome/browser/custom_handlers/register_protocol_handler_infobar_delegate.h"

#include "chrome/browser/net/chrome_url_request_context.h"

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

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

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

#include "chrome/common/chrome_notification_types.h"

@@ -732,13 +733,13 @@ void ProtocolHandlerRegistry::Shutdown() {

// static

void ProtocolHandlerRegistry::RegisterUserPrefs(

- PrefServiceSyncable* pref_service) {

- pref_service->RegisterListPref(prefs::kRegisteredProtocolHandlers,

- PrefServiceSyncable::UNSYNCABLE_PREF);

- pref_service->RegisterListPref(prefs::kIgnoredProtocolHandlers,

- PrefServiceSyncable::UNSYNCABLE_PREF);

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

- PrefServiceSyncable::UNSYNCABLE_PREF);

+ PrefRegistrySyncable* registry) {

+ registry->RegisterListPref(prefs::kRegisteredProtocolHandlers,

+ PrefRegistrySyncable::UNSYNCABLE_PREF);

+ registry->RegisterListPref(prefs::kIgnoredProtocolHandlers,

+ PrefRegistrySyncable::UNSYNCABLE_PREF);

+ registry->RegisterBooleanPref(prefs::kCustomHandlersEnabled, true,

+ PrefRegistrySyncable::UNSYNCABLE_PREF);

}

ProtocolHandlerRegistry::~ProtocolHandlerRegistry() {