Index: chrome/browser/renderer_host/chrome_resource_dispatcher_host_delegate.cc |
diff --git a/chrome/browser/renderer_host/chrome_resource_dispatcher_host_delegate.cc b/chrome/browser/renderer_host/chrome_resource_dispatcher_host_delegate.cc |
index 81b808877cf73a9a575aa3f85fedbd4abf99a823..c3c6480fd5ef0932e9822791d461dec2f5339da4 100644 |
--- a/chrome/browser/renderer_host/chrome_resource_dispatcher_host_delegate.cc |
+++ b/chrome/browser/renderer_host/chrome_resource_dispatcher_host_delegate.cc |
@@ -13,7 +13,6 @@ |
#include "chrome/browser/browser_process.h" |
#include "chrome/browser/chrome_notification_types.h" |
#include "chrome/browser/component_updater/component_updater_resource_throttle.h" |
-#include "chrome/browser/component_updater/pnacl/pnacl_component_installer.h" |
#include "chrome/browser/content_settings/host_content_settings_map.h" |
#include "chrome/browser/download/download_request_limiter.h" |
#include "chrome/browser/download/download_resource_throttle.h" |
@@ -53,6 +52,10 @@ |
#include "net/http/http_response_headers.h" |
#include "net/url_request/url_request.h" |
+#if !defined(DISABLE_NACL) |
+#include "chrome/browser/component_updater/pnacl/pnacl_component_installer.h" |
+#endif |
+ |
#if defined(ENABLE_CONFIGURATION_POLICY) |
#include "components/policy/core/common/cloud/policy_header_io_helper.h" |
#endif |
@@ -223,6 +226,7 @@ void LaunchURL(const GURL& url, int render_process_id, int render_view_id) { |
} |
#endif // !defined(OS_ANDROID) |
+#if !defined(DISABLE_NACL) |
void AppendComponentUpdaterThrottles( |
net::URLRequest* request, |
content::ResourceContext* resource_context, |
@@ -251,8 +255,9 @@ void AppendComponentUpdaterThrottles( |
component_updater::GetOnDemandResourceThrottle(cus, crx_id)); |
} |
} |
+#endif // !defined(DISABLE_NACL) |
-} // end namespace |
+} // namespace |
ChromeResourceDispatcherHostDelegate::ChromeResourceDispatcherHostDelegate( |
prerender::PrerenderTracker* prerender_tracker) |
@@ -397,12 +402,14 @@ void ChromeResourceDispatcherHostDelegate::RequestBeginning( |
resource_context, |
resource_type, |
throttles); |
+#if !defined(DISABLE_NACL) |
if (!is_prerendering) { |
AppendComponentUpdaterThrottles(request, |
resource_context, |
resource_type, |
throttles); |
} |
+#endif |
} |
void ChromeResourceDispatcherHostDelegate::DownloadStarting( |