Index: chrome/browser/net/chrome_network_delegate.h |
diff --git a/chrome/browser/net/chrome_network_delegate.h b/chrome/browser/net/chrome_network_delegate.h |
index 7a05ca514cc6f1099b533e130e8318b0d7ca07b5..a67f77375b3da36855240b053f1a7b55cfbe0dc8 100644 |
--- a/chrome/browser/net/chrome_network_delegate.h |
+++ b/chrome/browser/net/chrome_network_delegate.h |
@@ -16,6 +16,7 @@ |
#include "components/data_reduction_proxy/browser/data_reduction_proxy_metrics.h" |
#include "net/base/network_delegate.h" |
+class ChromeExtensionsNetworkDelegate; |
class ClientHints; |
class CookieSettings; |
class PrefService; |
@@ -68,20 +69,20 @@ class ChromeNetworkDelegate : public net::NetworkDelegate { |
BooleanPrefMember* enable_referrers); |
virtual ~ChromeNetworkDelegate(); |
- // Not inlined because we assign a scoped_refptr, which requires us to include |
- // the header file. |
+ // Pass through to ChromeExtensionsNetworkDelegate::set_extension_info_map(). |
void set_extension_info_map(extensions::InfoMap* extension_info_map); |
+#if defined(ENABLE_CONFIGURATION_POLICY) |
void set_url_blacklist_manager( |
const policy::URLBlacklistManager* url_blacklist_manager) { |
url_blacklist_manager_ = url_blacklist_manager; |
} |
+#endif |
// If |profile| is NULL or not set, events will be broadcast to all profiles, |
// otherwise they will only be sent to the specified profile. |
- void set_profile(void* profile) { |
- profile_ = profile; |
- } |
+ // Also pass through to ChromeExtensionsNetworkDelegate::set_profile(). |
+ void set_profile(void* profile); |
// |profile_path| is used to locate the "Downloads" folder on Chrome OS. If it |
// is set, the location of the Downloads folder for the profile is added to |
@@ -109,9 +110,8 @@ class ChromeNetworkDelegate : public net::NetworkDelegate { |
} |
void set_domain_reliability_monitor( |
- domain_reliability::DomainReliabilityMonitor* |
- domain_reliability_monitor) { |
- domain_reliability_monitor_ = domain_reliability_monitor; |
+ domain_reliability::DomainReliabilityMonitor* monitor) { |
+ domain_reliability_monitor_ = monitor; |
} |
void set_prerender_tracker(prerender::PrerenderTracker* prerender_tracker) { |
@@ -205,13 +205,12 @@ class ChromeNetworkDelegate : public net::NetworkDelegate { |
int64 original_payload_byte_count, |
data_reduction_proxy::DataReductionProxyRequestType request_type); |
- scoped_refptr<extensions::EventRouterForwarder> event_router_; |
+ scoped_ptr<ChromeExtensionsNetworkDelegate> extensions_delegate_; |
+ |
void* profile_; |
base::FilePath profile_path_; |
scoped_refptr<CookieSettings> cookie_settings_; |
- scoped_refptr<extensions::InfoMap> extension_info_map_; |
- |
scoped_ptr<chrome_browser_net::ConnectInterceptor> connect_interceptor_; |
// Weak, owned by our owner. |
@@ -220,7 +219,9 @@ class ChromeNetworkDelegate : public net::NetworkDelegate { |
BooleanPrefMember* force_google_safe_search_; |
// Weak, owned by our owner. |
+#if defined(ENABLE_CONFIGURATION_POLICY) |
const policy::URLBlacklistManager* url_blacklist_manager_; |
+#endif |
domain_reliability::DomainReliabilityMonitor* domain_reliability_monitor_; |
// When true, allow access to all file:// URLs. |