OLD | NEW |
---|---|
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 "base/strings/string_util.h" | |
12 #include "chrome/browser/browser_process.h" | 13 #include "chrome/browser/browser_process.h" |
13 #include "chrome/browser/chrome_notification_types.h" | 14 #include "chrome/browser/chrome_notification_types.h" |
15 #include "chrome/browser/component_updater/component_updater_service.h" | |
14 #include "chrome/browser/content_settings/host_content_settings_map.h" | 16 #include "chrome/browser/content_settings/host_content_settings_map.h" |
15 #include "chrome/browser/download/download_request_limiter.h" | 17 #include "chrome/browser/download/download_request_limiter.h" |
16 #include "chrome/browser/download/download_resource_throttle.h" | 18 #include "chrome/browser/download/download_resource_throttle.h" |
17 #include "chrome/browser/extensions/api/streams_private/streams_private_api.h" | 19 #include "chrome/browser/extensions/api/streams_private/streams_private_api.h" |
18 #include "chrome/browser/extensions/extension_info_map.h" | 20 #include "chrome/browser/extensions/extension_info_map.h" |
19 #include "chrome/browser/extensions/extension_renderer_state.h" | 21 #include "chrome/browser/extensions/extension_renderer_state.h" |
20 #include "chrome/browser/extensions/user_script_listener.h" | 22 #include "chrome/browser/extensions/user_script_listener.h" |
21 #include "chrome/browser/external_protocol/external_protocol_handler.h" | 23 #include "chrome/browser/external_protocol/external_protocol_handler.h" |
22 #include "chrome/browser/google/google_util.h" | 24 #include "chrome/browser/google/google_util.h" |
23 #include "chrome/browser/metrics/variations/variations_http_header_provider.h" | 25 #include "chrome/browser/metrics/variations/variations_http_header_provider.h" |
(...skipping 160 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... | |
184 } else if (url.SchemeIs("chrome-extension")) { | 186 } else if (url.SchemeIs("chrome-extension")) { |
185 ReportPrerenderSchemeCancelReason( | 187 ReportPrerenderSchemeCancelReason( |
186 PRERENDER_SCHEME_CANCEL_REASON_CHROME_EXTENSION); | 188 PRERENDER_SCHEME_CANCEL_REASON_CHROME_EXTENSION); |
187 } else if (url.SchemeIs("about")) { | 189 } else if (url.SchemeIs("about")) { |
188 ReportPrerenderSchemeCancelReason(PRERENDER_SCHEME_CANCEL_REASON_ABOUT); | 190 ReportPrerenderSchemeCancelReason(PRERENDER_SCHEME_CANCEL_REASON_ABOUT); |
189 } else { | 191 } else { |
190 ReportPrerenderSchemeCancelReason(PRERENDER_SCHEME_CANCEL_REASON_UNKNOWN); | 192 ReportPrerenderSchemeCancelReason(PRERENDER_SCHEME_CANCEL_REASON_UNKNOWN); |
191 } | 193 } |
192 } | 194 } |
193 | 195 |
196 void AppendComponentUpaterThrottles( | |
197 net::URLRequest* request, | |
198 content::ResourceContext* resource_context, | |
199 ResourceType::Type resource_type, | |
200 ScopedVector<content::ResourceThrottle>* throttles) { | |
201 | |
202 char* crx_id = NULL; | |
203 | |
204 // Each component can go bananas here with custom checks. Here is an | |
205 // example of pNaCL doing a custom check. | |
206 if (resource_type == ResourceType::OBJECT) { | |
207 if (EndsWith(request->url().ExtractFileName(), ".pexe", false)) | |
208 crx_id = "hnimpnehoodheedghdeeijklkeaacbdc"; | |
darin (slow to review)
2013/10/03 21:31:43
we probably want to base this on mime type instead
jvoung (off chromium)
2013/10/09 17:05:22
Separately in a mail thread, I suggested adding so
cpu_(ooo_6.6-7.5)
2013/10/20 23:27:25
Yeah, a special header sounds nice to me.
| |
209 } | |
210 | |
211 if (crx_id) { | |
212 ComponentUpdateService* cus = g_browser_process->component_updater(); | |
213 throttles->push_back(cus->GetResourceThrottle(request, crx_id)); | |
214 } | |
215 } | |
216 | |
194 } // end namespace | 217 } // end namespace |
195 | 218 |
196 ChromeResourceDispatcherHostDelegate::ChromeResourceDispatcherHostDelegate( | 219 ChromeResourceDispatcherHostDelegate::ChromeResourceDispatcherHostDelegate( |
197 prerender::PrerenderTracker* prerender_tracker) | 220 prerender::PrerenderTracker* prerender_tracker) |
198 : download_request_limiter_(g_browser_process->download_request_limiter()), | 221 : download_request_limiter_(g_browser_process->download_request_limiter()), |
199 safe_browsing_(g_browser_process->safe_browsing_service()), | 222 safe_browsing_(g_browser_process->safe_browsing_service()), |
200 user_script_listener_(new extensions::UserScriptListener()), | 223 user_script_listener_(new extensions::UserScriptListener()), |
201 prerender_tracker_(prerender_tracker) { | 224 prerender_tracker_(prerender_tracker) { |
202 } | 225 } |
203 | 226 |
(...skipping 106 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... | |
310 } | 333 } |
311 | 334 |
312 #if defined(ENABLE_ONE_CLICK_SIGNIN) | 335 #if defined(ENABLE_ONE_CLICK_SIGNIN) |
313 AppendChromeSyncGaiaHeader(request, resource_context); | 336 AppendChromeSyncGaiaHeader(request, resource_context); |
314 #endif | 337 #endif |
315 | 338 |
316 AppendStandardResourceThrottles(request, | 339 AppendStandardResourceThrottles(request, |
317 resource_context, | 340 resource_context, |
318 resource_type, | 341 resource_type, |
319 throttles); | 342 throttles); |
343 if (!is_prerendering) { | |
344 AppendComponentUpaterThrottles(request, | |
345 resource_context, | |
346 resource_type, | |
347 throttles); | |
348 } | |
320 | 349 |
321 if (io_data->resource_prefetch_predictor_observer()) { | 350 if (io_data->resource_prefetch_predictor_observer()) { |
322 io_data->resource_prefetch_predictor_observer()->OnRequestStarted( | 351 io_data->resource_prefetch_predictor_observer()->OnRequestStarted( |
323 request, resource_type, child_id, route_id); | 352 request, resource_type, child_id, route_id); |
324 } | 353 } |
325 } | 354 } |
326 | 355 |
327 void ChromeResourceDispatcherHostDelegate::WillTransferRequestToNewProcess( | 356 void ChromeResourceDispatcherHostDelegate::WillTransferRequestToNewProcess( |
328 int old_child_id, | 357 int old_child_id, |
329 int old_route_id, | 358 int old_route_id, |
(...skipping 324 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... | |
654 if (!prerender::PrerenderManager::DoesURLHaveValidScheme(redirect_url) && | 683 if (!prerender::PrerenderManager::DoesURLHaveValidScheme(redirect_url) && |
655 ResourceRequestInfo::ForRequest(request)->GetAssociatedRenderView( | 684 ResourceRequestInfo::ForRequest(request)->GetAssociatedRenderView( |
656 &child_id, &route_id) && | 685 &child_id, &route_id) && |
657 prerender_tracker_->IsPrerenderingOnIOThread(child_id, route_id) && | 686 prerender_tracker_->IsPrerenderingOnIOThread(child_id, route_id) && |
658 prerender_tracker_->TryCancel( | 687 prerender_tracker_->TryCancel( |
659 child_id, route_id, prerender::FINAL_STATUS_UNSUPPORTED_SCHEME)) { | 688 child_id, route_id, prerender::FINAL_STATUS_UNSUPPORTED_SCHEME)) { |
660 ReportUnsupportedPrerenderScheme(redirect_url); | 689 ReportUnsupportedPrerenderScheme(redirect_url); |
661 request->Cancel(); | 690 request->Cancel(); |
662 } | 691 } |
663 } | 692 } |
OLD | NEW |