diff options
| author | thestig@chromium.org <thestig@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2014-07-19 04:52:06 +0000 |
|---|---|---|
| committer | thestig@chromium.org <thestig@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2014-07-19 04:52:06 +0000 |
| commit | 84b7a55e7c59e49cdcfdba541b955216bd064347 (patch) | |
| tree | 98f71f0c9718106073e168a53144524e3d7b8369 /chrome/browser/net/chrome_network_delegate.cc | |
| parent | 5e034244b31e9b0cf30768d026d42a54e5822a4d (diff) | |
| download | chromium_src-84b7a55e7c59e49cdcfdba541b955216bd064347.zip chromium_src-84b7a55e7c59e49cdcfdba541b955216bd064347.tar.gz chromium_src-84b7a55e7c59e49cdcfdba541b955216bd064347.tar.bz2 | |
ifdef extensions code in BrowserProcess, IOThread, and ChromeNetworkDelegate.
BUG=349436
Review URL: https://codereview.chromium.org/387003008
git-svn-id: svn://svn.chromium.org/chrome/trunk/src@284312 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'chrome/browser/net/chrome_network_delegate.cc')
| -rw-r--r-- | chrome/browser/net/chrome_network_delegate.cc | 13 |
1 files changed, 12 insertions, 1 deletions
diff --git a/chrome/browser/net/chrome_network_delegate.cc b/chrome/browser/net/chrome_network_delegate.cc index 4e81a7b..a7d81e5 100644 --- a/chrome/browser/net/chrome_network_delegate.cc +++ b/chrome/browser/net/chrome_network_delegate.cc @@ -42,7 +42,6 @@ #include "content/public/browser/render_frame_host.h" #include "content/public/browser/render_view_host.h" #include "content/public/browser/resource_request_info.h" -#include "extensions/common/constants.h" #include "net/base/host_port_pair.h" #include "net/base/net_errors.h" #include "net/base/net_log.h" @@ -72,6 +71,10 @@ #include "components/policy/core/browser/url_blacklist_manager.h" #endif +#if defined(ENABLE_EXTENSIONS) +#include "extensions/common/constants.h" +#endif + using content::BrowserThread; using content::RenderViewHost; using content::ResourceRequestInfo; @@ -85,9 +88,11 @@ bool ChromeNetworkDelegate::g_allow_file_access_ = false; bool ChromeNetworkDelegate::g_allow_file_access_ = true; #endif +#if defined(ENABLE_EXTENSIONS) // This remains false unless the --disable-extensions-http-throttling // flag is passed to the browser. bool ChromeNetworkDelegate::g_never_throttle_requests_ = false; +#endif namespace { @@ -338,9 +343,11 @@ void ChromeNetworkDelegate::SetEnableClientHints() { } // static +#if defined(ENABLE_EXTENSIONS) void ChromeNetworkDelegate::NeverThrottleRequests() { g_never_throttle_requests_ = true; } +#endif // static void ChromeNetworkDelegate::InitializePrefsOnUIThread( @@ -789,10 +796,14 @@ bool ChromeNetworkDelegate::OnCanAccessFile(const net::URLRequest& request, bool ChromeNetworkDelegate::OnCanThrottleRequest( const net::URLRequest& request) const { +#if defined(ENABLE_EXTENSIONS) if (g_never_throttle_requests_) return false; return request.first_party_for_cookies().scheme() == extensions::kExtensionScheme; +#else + return false; +#endif } bool ChromeNetworkDelegate::OnCanEnablePrivacyMode( |