| 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 641ea182807c25be3cd536f22800967306d79ba5..ba014ef840845daeea7849515ccf7d4f37dcf5cf 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
|
|
|
| -} // end namespace
|
| +} // namespace
|
|
|
| ChromeResourceDispatcherHostDelegate::ChromeResourceDispatcherHostDelegate(
|
| prerender::PrerenderTracker* prerender_tracker)
|
| @@ -402,12 +407,14 @@ void ChromeResourceDispatcherHostDelegate::RequestBeginning(
|
| resource_context,
|
| resource_type,
|
| throttles);
|
| +#if defined(ENABLE_PLUGINS)
|
| if (!is_prerendering) {
|
| AppendComponentUpdaterThrottles(request,
|
| resource_context,
|
| resource_type,
|
| throttles);
|
| }
|
| +#endif
|
| }
|
|
|
| void ChromeResourceDispatcherHostDelegate::DownloadStarting(
|
|
|