chrome/browser/prefs/browser_prefs.cc - Issue 6410115: Adds navigator.registerProtocolHandler.

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/browser_prefs.cc

Issue 6410115: Adds navigator.registerProtocolHandler. (Closed) Base URL: http://git.chromium.org/git/chromium.git@trunk

Patch Set: Responded to comments, prevents rph on privileged protocols. Created 9 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/prefs/browser_prefs.cc

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

index a3a498f36311f29e47e25a2f87314491e81ec7af..f84ac39070ebddccc0fa0b816185263b65615436 100644

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

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

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

#include "chrome/browser/bookmarks/bookmark_utils.h"

#include "chrome/browser/browser_shutdown.h"

#include "chrome/browser/content_settings/host_content_settings_map.h"

+#include "chrome/browser/custom_handlers/protocol_handler_registry.h"

#include "chrome/browser/debugger/devtools_manager.h"

#include "chrome/browser/dom_ui/flags_ui.h"

#include "chrome/browser/dom_ui/new_tab_ui.h"

@@ -154,6 +155,7 @@ void RegisterUserPrefs(PrefService* user_prefs) {

InstantController::RegisterUserPrefs(user_prefs);

NetPrefObserver::RegisterPrefs(user_prefs);

policy::ProfilePolicyContext::RegisterUserPrefs(user_prefs);

+ ProtocolHandlerRegistry::RegisterPrefs(user_prefs);

}

void MigrateBrowserPrefs(PrefService* user_prefs, PrefService* local_state) {