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

Unified Diff: chrome/browser/profiles/profile_io_data.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_io_data.cc
diff --git a/chrome/browser/profiles/profile_io_data.cc b/chrome/browser/profiles/profile_io_data.cc
index e60dd6bd2ac042c1c15181c0719bc7819059078d..ec350d8213a8a42d99dfa91a9de5f9a56a7a5f05 100644
--- a/chrome/browser/profiles/profile_io_data.cc
+++ b/chrome/browser/profiles/profile_io_data.cc
@@ -28,6 +28,7 @@
#include "chrome/browser/net/pref_proxy_config_service.h"
#include "chrome/browser/net/proxy_service_factory.h"
#include "chrome/browser/notifications/desktop_notification_service_factory.h"
+#include "chrome/browser/policy/host_blacklist_manager.h"
#include "chrome/browser/prefs/pref_service.h"
#include "chrome/browser/prerender/prerender_manager.h"
#include "chrome/browser/profiles/profile.h"
@@ -236,6 +237,7 @@ void ProfileIOData::InitializeProfileParams(Profile* profile) {
params->blob_storage_context = profile->GetBlobStorageContext();
params->file_system_context = profile->GetFileSystemContext();
params->quota_manager = profile->GetQuotaManager();
+ params->host_blacklist_manager = profile->GetHostBlacklistManager();
params->extension_info_map = profile->GetExtensionInfoMap();
params->notification_service =
DesktopNotificationServiceFactory::GetForProfile(profile);
@@ -404,6 +406,7 @@ void ProfileIOData::LazyInitialize() const {
network_delegate_.reset(new ChromeNetworkDelegate(
io_thread_globals->extension_event_router_forwarder.get(),
profile_params_->extension_info_map,
+ profile_params_->host_blacklist_manager.get(),
profile_params_->profile,
&enable_referrers_));
@@ -468,6 +471,7 @@ void ProfileIOData::LazyInitialize() const {
blob_storage_context_ = profile_params_->blob_storage_context;
file_system_context_ = profile_params_->file_system_context;
quota_manager_ = profile_params_->quota_manager;
+ host_blacklist_manager_ = profile_params_->host_blacklist_manager;
host_zoom_map_ = profile_params_->host_zoom_map;
host_content_settings_map_ = profile_params_->host_content_settings_map;
notification_service_ = profile_params_->notification_service;

Powered by Google App Engine
This is Rietveld 408576698