chrome/browser/prefs/browser_prefs.cc - Issue 7716003: WIP: URL blacklisting by policy.

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 7716003: WIP: URL blacklisting by policy. (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src

Patch Set: Reviewed Created 9 years, 4 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 b64f8f59522ed21cc05611afc9ab7f217e902226..b1f6a0d15305a9afb2e71d09c50def51fa9c206a 100644

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

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

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

#include "chrome/browser/password_manager/password_manager.h"

#include "chrome/browser/plugin_prefs.h"

#include "chrome/browser/policy/cloud_policy_subsystem.h"

+#include "chrome/browser/policy/url_blacklist_manager.h"

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

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

#include "chrome/browser/printing/print_job_manager.h"

@@ -183,6 +184,9 @@ void RegisterUserPrefs(PrefService* user_prefs) {

#if defined(OS_MACOSX)

PresentationModePrefs::RegisterUserPrefs(user_prefs);

#endif

+#if defined(ENABLE_CONFIGURATION_POLICY)

+ policy::URLBlacklistManager::RegisterPrefs(user_prefs);

+#endif

}

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