Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(3801)

Issues Search
    My Issues | Starred     Open | Closed | All

Unified Diff: chrome/browser/prefs/browser_prefs.cc

Issue 7747018: Introduced the URLBlacklistManager, and wired it to various places. (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: Reviewed, rebased 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:
View side-by-side diff with in-line comments
Download patch
« chrome/browser/policy/host_blacklist_manager_unittest.cc ('K') | « chrome/browser/policy/host_blacklist_manager_unittest.cc ('k') | chrome/browser/profiles/profile.h » ('j') | chrome/browser/profiles/profile.h » ('J')
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: chrome/browser/prefs/browser_prefs.cc
diff --git a/chrome/browser/prefs/browser_prefs.cc b/chrome/browser/prefs/browser_prefs.cc
index 3307aa11654bd9bfda0cc9bacc371a48863afdf1..751dff7326f5aca165c0ec54ca8b6d8d18e4b5d2 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/host_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::HostBlacklistManager::RegisterPrefs(user_prefs);
+#endif
}
void MigrateBrowserPrefs(PrefService* user_prefs, PrefService* local_state) {
« chrome/browser/policy/host_blacklist_manager_unittest.cc ('K') | « chrome/browser/policy/host_blacklist_manager_unittest.cc ('k') | chrome/browser/profiles/profile.h » ('j') | chrome/browser/profiles/profile.h » ('J')

Powered by Google App Engine
This is Rietveld 408576698