Chromium Code Reviews| 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" | |
|
jvoung (off chromium)
2013/10/31 22:45:17
Just checking, what is string_util.h used for? (in
cpu_(ooo_6.6-7.5)
2013/11/01 18:33:37
Not needed. removed.
| |
| 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 162 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... | |
| 186 } else if (url.SchemeIs("chrome-extension")) { | 188 } else if (url.SchemeIs("chrome-extension")) { |
| 187 ReportPrerenderSchemeCancelReason( | 189 ReportPrerenderSchemeCancelReason( |
| 188 PRERENDER_SCHEME_CANCEL_REASON_CHROME_EXTENSION); | 190 PRERENDER_SCHEME_CANCEL_REASON_CHROME_EXTENSION); |
| 189 } else if (url.SchemeIs("about")) { | 191 } else if (url.SchemeIs("about")) { |
| 190 ReportPrerenderSchemeCancelReason(PRERENDER_SCHEME_CANCEL_REASON_ABOUT); | 192 ReportPrerenderSchemeCancelReason(PRERENDER_SCHEME_CANCEL_REASON_ABOUT); |
| 191 } else { | 193 } else { |
| 192 ReportPrerenderSchemeCancelReason(PRERENDER_SCHEME_CANCEL_REASON_UNKNOWN); | 194 ReportPrerenderSchemeCancelReason(PRERENDER_SCHEME_CANCEL_REASON_UNKNOWN); |
| 193 } | 195 } |
| 194 } | 196 } |
| 195 | 197 |
| 198 void AppendComponentUpdaterThrottles( | |
| 199 net::URLRequest* request, | |
| 200 content::ResourceContext* resource_context, | |
| 201 ResourceType::Type resource_type, | |
| 202 ScopedVector<content::ResourceThrottle>* throttles) { | |
| 203 char* crx_id = NULL; | |
| 204 // Check for PNaCL nexe request. | |
| 205 if (resource_type == ResourceType::OBJECT) { | |
| 206 const net::HttpRequestHeaders& headers = request->extra_request_headers(); | |
| 207 std::string accept_headers; | |
| 208 if (headers.GetHeader("Accept", &accept_headers)) { | |
| 209 if (accept_headers.find("application/x-pnacl") != std::string::npos) | |
| 210 crx_id = "hnimpnehoodheedghdeeijklkeaacbdc"; | |
|
jvoung (off chromium)
2013/10/31 22:45:17
FYI: with GCC I got the following error:
../../ch
cpu_(ooo_6.6-7.5)
2013/11/01 18:33:37
Done.
| |
| 211 } | |
| 212 } | |
| 213 | |
| 214 if (crx_id) { | |
| 215 // We got a component we need to install, so throttle the resource | |
| 216 // until the component is installed. | |
| 217 ComponentUpdateService* cus = g_browser_process->component_updater(); | |
| 218 throttles->push_back(cus->GetOnDemandResourceThrottle(request, crx_id)); | |
| 219 } | |
| 220 } | |
| 221 | |
| 196 } // end namespace | 222 } // end namespace |
| 197 | 223 |
| 198 ChromeResourceDispatcherHostDelegate::ChromeResourceDispatcherHostDelegate( | 224 ChromeResourceDispatcherHostDelegate::ChromeResourceDispatcherHostDelegate( |
| 199 prerender::PrerenderTracker* prerender_tracker) | 225 prerender::PrerenderTracker* prerender_tracker) |
| 200 : download_request_limiter_(g_browser_process->download_request_limiter()), | 226 : download_request_limiter_(g_browser_process->download_request_limiter()), |
| 201 safe_browsing_(g_browser_process->safe_browsing_service()), | 227 safe_browsing_(g_browser_process->safe_browsing_service()), |
| 202 user_script_listener_(new extensions::UserScriptListener()), | 228 user_script_listener_(new extensions::UserScriptListener()), |
| 203 prerender_tracker_(prerender_tracker) { | 229 prerender_tracker_(prerender_tracker) { |
| 204 } | 230 } |
| 205 | 231 |
| (...skipping 106 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... | |
| 312 } | 338 } |
| 313 | 339 |
| 314 #if defined(ENABLE_ONE_CLICK_SIGNIN) | 340 #if defined(ENABLE_ONE_CLICK_SIGNIN) |
| 315 AppendChromeSyncGaiaHeader(request, resource_context); | 341 AppendChromeSyncGaiaHeader(request, resource_context); |
| 316 #endif | 342 #endif |
| 317 | 343 |
| 318 AppendStandardResourceThrottles(request, | 344 AppendStandardResourceThrottles(request, |
| 319 resource_context, | 345 resource_context, |
| 320 resource_type, | 346 resource_type, |
| 321 throttles); | 347 throttles); |
| 348 if (!is_prerendering) { | |
| 349 AppendComponentUpdaterThrottles(request, | |
| 350 resource_context, | |
| 351 resource_type, | |
| 352 throttles); | |
| 353 } | |
| 322 | 354 |
| 323 if (io_data->resource_prefetch_predictor_observer()) { | 355 if (io_data->resource_prefetch_predictor_observer()) { |
| 324 io_data->resource_prefetch_predictor_observer()->OnRequestStarted( | 356 io_data->resource_prefetch_predictor_observer()->OnRequestStarted( |
| 325 request, resource_type, child_id, route_id); | 357 request, resource_type, child_id, route_id); |
| 326 } | 358 } |
| 327 } | 359 } |
| 328 | 360 |
| 329 void ChromeResourceDispatcherHostDelegate::WillTransferRequestToNewProcess( | 361 void ChromeResourceDispatcherHostDelegate::WillTransferRequestToNewProcess( |
| 330 int old_child_id, | 362 int old_child_id, |
| 331 int old_route_id, | 363 int old_route_id, |
| (...skipping 331 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... | |
| 663 if (!prerender::PrerenderManager::DoesURLHaveValidScheme(redirect_url) && | 695 if (!prerender::PrerenderManager::DoesURLHaveValidScheme(redirect_url) && |
| 664 ResourceRequestInfo::ForRequest(request)->GetAssociatedRenderView( | 696 ResourceRequestInfo::ForRequest(request)->GetAssociatedRenderView( |
| 665 &child_id, &route_id) && | 697 &child_id, &route_id) && |
| 666 prerender_tracker_->IsPrerenderingOnIOThread(child_id, route_id) && | 698 prerender_tracker_->IsPrerenderingOnIOThread(child_id, route_id) && |
| 667 prerender_tracker_->TryCancel( | 699 prerender_tracker_->TryCancel( |
| 668 child_id, route_id, prerender::FINAL_STATUS_UNSUPPORTED_SCHEME)) { | 700 child_id, route_id, prerender::FINAL_STATUS_UNSUPPORTED_SCHEME)) { |
| 669 ReportUnsupportedPrerenderScheme(redirect_url); | 701 ReportUnsupportedPrerenderScheme(redirect_url); |
| 670 request->Cancel(); | 702 request->Cancel(); |
| 671 } | 703 } |
| 672 } | 704 } |
| OLD | NEW |