chrome/browser/external_protocol/external_protocol_handler.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/external_protocol/external_protocol_handler.cc

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

Patch Set: Fix double registration in Chrome Frame test. 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:

View side-by-side diff with in-line comments

Download patch

Index: chrome/browser/external_protocol/external_protocol_handler.cc

diff --git a/chrome/browser/external_protocol/external_protocol_handler.cc b/chrome/browser/external_protocol/external_protocol_handler.cc

index 18f32186a63d94919ee1e1c6a5ec5df965962b82..9eeed5b828ade266d9544d7ff8a664488ae15b70 100644

--- a/chrome/browser/external_protocol/external_protocol_handler.cc

+++ b/chrome/browser/external_protocol/external_protocol_handler.cc

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

#include "build/build_config.h"

#include "chrome/browser/browser_process.h"

#include "chrome/browser/platform_util.h"

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

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

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

#include "chrome/common/pref_names.h"

@@ -296,8 +297,8 @@ void ExternalProtocolHandler::LaunchUrlWithoutSecurityCheck(const GURL& url) {

}

// static

-void ExternalProtocolHandler::RegisterPrefs(PrefServiceSimple* prefs) {

- prefs->RegisterDictionaryPref(prefs::kExcludedSchemes);

+void ExternalProtocolHandler::RegisterPrefs(PrefRegistrySimple* registry) {

+ registry->RegisterDictionaryPref(prefs::kExcludedSchemes);

}

// static

« no previous file with comments | « chrome/browser/external_protocol/external_protocol_handler.h ('k') | chrome/browser/first_run/first_run.cc » ('j') | no next file with comments »