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

Side by Side Diff: chrome/browser/renderer_host/chrome_resource_dispatcher_host_delegate.cc

Issue 25713007: Component updater on-demand logic with ResourceThrottle (Closed) Base URL: svn://chrome-svn/chrome/trunk/src/
Patch Set: Created 7 years, 1 month 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 unified diff | Download patch | Annotate | Revision Log
OLDNEW
1 // Copyright (c) 2012 The Chromium Authors. All rights reserved. 1 // Copyright (c) 2012 The Chromium Authors. All rights reserved.
2 // Use of this source code is governed by a BSD-style license that can be 2 // Use of this source code is governed by a BSD-style license that can be
3 // found in the LICENSE file. 3 // found in the LICENSE file.
4 4
5 #include "chrome/browser/renderer_host/chrome_resource_dispatcher_host_delegate. h" 5 #include "chrome/browser/renderer_host/chrome_resource_dispatcher_host_delegate. h"
6 6
7 #include <string> 7 #include <string>
8 8
9 #include "base/base64.h" 9 #include "base/base64.h"
10 #include "base/logging.h" 10 #include "base/logging.h"
11 #include "base/metrics/histogram.h" 11 #include "base/metrics/histogram.h"
12 #include "chrome/browser/browser_process.h" 12 #include "chrome/browser/browser_process.h"
13 #include "chrome/browser/chrome_notification_types.h" 13 #include "chrome/browser/chrome_notification_types.h"
14 #include "chrome/browser/component_updater/component_updater_service.h"
14 #include "chrome/browser/content_settings/host_content_settings_map.h" 15 #include "chrome/browser/content_settings/host_content_settings_map.h"
15 #include "chrome/browser/download/download_request_limiter.h" 16 #include "chrome/browser/download/download_request_limiter.h"
16 #include "chrome/browser/download/download_resource_throttle.h" 17 #include "chrome/browser/download/download_resource_throttle.h"
17 #include "chrome/browser/extensions/api/streams_private/streams_private_api.h" 18 #include "chrome/browser/extensions/api/streams_private/streams_private_api.h"
18 #include "chrome/browser/extensions/extension_info_map.h" 19 #include "chrome/browser/extensions/extension_info_map.h"
19 #include "chrome/browser/extensions/extension_renderer_state.h" 20 #include "chrome/browser/extensions/extension_renderer_state.h"
20 #include "chrome/browser/extensions/user_script_listener.h" 21 #include "chrome/browser/extensions/user_script_listener.h"
21 #include "chrome/browser/external_protocol/external_protocol_handler.h" 22 #include "chrome/browser/external_protocol/external_protocol_handler.h"
22 #include "chrome/browser/google/google_util.h" 23 #include "chrome/browser/google/google_util.h"
23 #include "chrome/browser/metrics/variations/variations_http_header_provider.h" 24 #include "chrome/browser/metrics/variations/variations_http_header_provider.h"
(...skipping 162 matching lines...) Expand 10 before | Expand all | Expand 10 after
186 } else if (url.SchemeIs("chrome-extension")) { 187 } else if (url.SchemeIs("chrome-extension")) {
187 ReportPrerenderSchemeCancelReason( 188 ReportPrerenderSchemeCancelReason(
188 PRERENDER_SCHEME_CANCEL_REASON_CHROME_EXTENSION); 189 PRERENDER_SCHEME_CANCEL_REASON_CHROME_EXTENSION);
189 } else if (url.SchemeIs("about")) { 190 } else if (url.SchemeIs("about")) {
190 ReportPrerenderSchemeCancelReason(PRERENDER_SCHEME_CANCEL_REASON_ABOUT); 191 ReportPrerenderSchemeCancelReason(PRERENDER_SCHEME_CANCEL_REASON_ABOUT);
191 } else { 192 } else {
192 ReportPrerenderSchemeCancelReason(PRERENDER_SCHEME_CANCEL_REASON_UNKNOWN); 193 ReportPrerenderSchemeCancelReason(PRERENDER_SCHEME_CANCEL_REASON_UNKNOWN);
193 } 194 }
194 } 195 }
195 196
197 void AppendComponentUpdaterThrottles(
198 net::URLRequest* request,
199 content::ResourceContext* resource_context,
200 ResourceType::Type resource_type,
201 ScopedVector<content::ResourceThrottle>* throttles) {
202 const char* crx_id = NULL;
203 // Check for PNaCL nexe request.
204 if (resource_type == ResourceType::OBJECT) {
205 const net::HttpRequestHeaders& headers = request->extra_request_headers();
206 std::string accept_headers;
207 if (headers.GetHeader("Accept", &accept_headers)) {
208 if (accept_headers.find("application/x-pnacl") != std::string::npos)
209 crx_id = "hnimpnehoodheedghdeeijklkeaacbdc";
210 }
211 }
212
213 if (crx_id) {
214 // We got a component we need to install, so throttle the resource
215 // until the component is installed.
216 ComponentUpdateService* cus = g_browser_process->component_updater();
217 throttles->push_back(cus->GetOnDemandResourceThrottle(request, crx_id));
218 }
219 }
220
196 } // end namespace 221 } // end namespace
197 222
198 ChromeResourceDispatcherHostDelegate::ChromeResourceDispatcherHostDelegate( 223 ChromeResourceDispatcherHostDelegate::ChromeResourceDispatcherHostDelegate(
199 prerender::PrerenderTracker* prerender_tracker) 224 prerender::PrerenderTracker* prerender_tracker)
200 : download_request_limiter_(g_browser_process->download_request_limiter()), 225 : download_request_limiter_(g_browser_process->download_request_limiter()),
201 safe_browsing_(g_browser_process->safe_browsing_service()), 226 safe_browsing_(g_browser_process->safe_browsing_service()),
202 user_script_listener_(new extensions::UserScriptListener()), 227 user_script_listener_(new extensions::UserScriptListener()),
203 prerender_tracker_(prerender_tracker) { 228 prerender_tracker_(prerender_tracker) {
204 } 229 }
205 230
(...skipping 106 matching lines...) Expand 10 before | Expand all | Expand 10 after
312 } 337 }
313 338
314 #if defined(ENABLE_ONE_CLICK_SIGNIN) 339 #if defined(ENABLE_ONE_CLICK_SIGNIN)
315 AppendChromeSyncGaiaHeader(request, resource_context); 340 AppendChromeSyncGaiaHeader(request, resource_context);
316 #endif 341 #endif
317 342
318 AppendStandardResourceThrottles(request, 343 AppendStandardResourceThrottles(request,
319 resource_context, 344 resource_context,
320 resource_type, 345 resource_type,
321 throttles); 346 throttles);
347 if (!is_prerendering) {
darin (slow to review) 2013/11/01 21:14:41 we should probably make sure that the presence of
cpu_(ooo_6.6-7.5) 2013/11/01 22:43:37 Yeah, nacl is disabled since the infamous PinkyPie
348 AppendComponentUpdaterThrottles(request,
349 resource_context,
darin (slow to review) 2013/11/01 21:14:41 nit: indentation
cpu_(ooo_6.6-7.5) 2013/11/01 22:43:37 Done.
350 resource_type,
351 throttles);
352 }
322 353
323 if (io_data->resource_prefetch_predictor_observer()) { 354 if (io_data->resource_prefetch_predictor_observer()) {
324 io_data->resource_prefetch_predictor_observer()->OnRequestStarted( 355 io_data->resource_prefetch_predictor_observer()->OnRequestStarted(
325 request, resource_type, child_id, route_id); 356 request, resource_type, child_id, route_id);
326 } 357 }
327 } 358 }
328 359
329 void ChromeResourceDispatcherHostDelegate::WillTransferRequestToNewProcess( 360 void ChromeResourceDispatcherHostDelegate::WillTransferRequestToNewProcess(
330 int old_child_id, 361 int old_child_id,
331 int old_route_id, 362 int old_route_id,
(...skipping 331 matching lines...) Expand 10 before | Expand all | Expand 10 after
663 if (!prerender::PrerenderManager::DoesURLHaveValidScheme(redirect_url) && 694 if (!prerender::PrerenderManager::DoesURLHaveValidScheme(redirect_url) &&
664 ResourceRequestInfo::ForRequest(request)->GetAssociatedRenderView( 695 ResourceRequestInfo::ForRequest(request)->GetAssociatedRenderView(
665 &child_id, &route_id) && 696 &child_id, &route_id) &&
666 prerender_tracker_->IsPrerenderingOnIOThread(child_id, route_id) && 697 prerender_tracker_->IsPrerenderingOnIOThread(child_id, route_id) &&
667 prerender_tracker_->TryCancel( 698 prerender_tracker_->TryCancel(
668 child_id, route_id, prerender::FINAL_STATUS_UNSUPPORTED_SCHEME)) { 699 child_id, route_id, prerender::FINAL_STATUS_UNSUPPORTED_SCHEME)) {
669 ReportUnsupportedPrerenderScheme(redirect_url); 700 ReportUnsupportedPrerenderScheme(redirect_url);
670 request->Cancel(); 701 request->Cancel();
671 } 702 }
672 } 703 }
OLDNEW

Powered by Google App Engine
This is Rietveld 408576698