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

Unified Diff: chrome/browser/profiles/profile_impl.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
Index: chrome/browser/profiles/profile_impl.cc
diff --git a/chrome/browser/profiles/profile_impl.cc b/chrome/browser/profiles/profile_impl.cc
index d33e81a0ff905070e93320a1b8be35bf3c0d1466..6c181e7f5ee6684833dca72c97461cb694f4474d 100644
--- a/chrome/browser/profiles/profile_impl.cc
+++ b/chrome/browser/profiles/profile_impl.cc
@@ -51,6 +51,7 @@
#include "chrome/browser/net/ssl_config_service_manager.h"
#include "chrome/browser/password_manager/password_store_default.h"
#include "chrome/browser/policy/configuration_policy_pref_store.h"
+#include "chrome/browser/policy/host_blacklist_manager.h"
#include "chrome/browser/prefs/browser_prefs.h"
#include "chrome/browser/prefs/pref_value_store.h"
#include "chrome/browser/prefs/scoped_user_pref_update.h"
@@ -741,6 +742,9 @@ ProfileImpl::~ProfileImpl() {
if (host_content_settings_map_)
host_content_settings_map_->ShutdownOnUIThread();
+ if (host_blacklist_manager_)
+ host_blacklist_manager_->ShutdownOnUIThread();
+
// This causes the Preferences file to be written to disk.
MarkAsCleanShutdown();
}
@@ -1582,6 +1586,16 @@ ChromeURLDataManager* ProfileImpl::GetChromeURLDataManager() {
return chrome_url_data_manager_.get();
}
+policy::HostBlacklistManager* ProfileImpl::GetHostBlacklistManager() {
+#if defined(ENABLE_CONFIGURATION_POLICY)
+ if (!host_blacklist_manager_.get()) {
+ host_blacklist_manager_ = new policy::HostBlacklistManager(this);
+ host_blacklist_manager_->Initialize();
+ }
+#endif
+ return host_blacklist_manager_.get();
+}
+
PromoCounter* ProfileImpl::GetInstantPromoCounter() {
#if defined(OS_WIN)
// TODO: enable this when we're ready to turn on the promo.

Powered by Google App Engine
This is Rietveld 408576698