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 "content/browser/loader/resource_loader.h" | 5 #include "content/browser/loader/resource_loader.h" |
6 | 6 |
7 #include "base/command_line.h" | 7 #include "base/command_line.h" |
8 #include "base/message_loop/message_loop.h" | 8 #include "base/message_loop/message_loop.h" |
9 #include "base/metrics/histogram.h" | 9 #include "base/metrics/histogram.h" |
10 #include "base/time/time.h" | 10 #include "base/time/time.h" |
(...skipping 44 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
55 response_info.npn_negotiated_protocol; | 55 response_info.npn_negotiated_protocol; |
56 response->head.connection_info = response_info.connection_info; | 56 response->head.connection_info = response_info.connection_info; |
57 response->head.was_fetched_via_proxy = request->was_fetched_via_proxy(); | 57 response->head.was_fetched_via_proxy = request->was_fetched_via_proxy(); |
58 response->head.socket_address = request->GetSocketAddress(); | 58 response->head.socket_address = request->GetSocketAddress(); |
59 if (ServiceWorkerRequestHandler* handler = | 59 if (ServiceWorkerRequestHandler* handler = |
60 ServiceWorkerRequestHandler::GetHandler(request)) { | 60 ServiceWorkerRequestHandler::GetHandler(request)) { |
61 handler->GetExtraResponseInfo( | 61 handler->GetExtraResponseInfo( |
62 &response->head.was_fetched_via_service_worker, | 62 &response->head.was_fetched_via_service_worker, |
63 &response->head.was_fallback_required_by_service_worker, | 63 &response->head.was_fallback_required_by_service_worker, |
64 &response->head.original_url_via_service_worker, | 64 &response->head.original_url_via_service_worker, |
| 65 &response->head.response_type_via_service_worker, |
65 &response->head.service_worker_fetch_start, | 66 &response->head.service_worker_fetch_start, |
66 &response->head.service_worker_fetch_ready, | 67 &response->head.service_worker_fetch_ready, |
67 &response->head.service_worker_fetch_end); | 68 &response->head.service_worker_fetch_end); |
68 } | 69 } |
69 AppCacheInterceptor::GetExtraResponseInfo( | 70 AppCacheInterceptor::GetExtraResponseInfo( |
70 request, | 71 request, |
71 &response->head.appcache_id, | 72 &response->head.appcache_id, |
72 &response->head.appcache_manifest_url); | 73 &response->head.appcache_manifest_url); |
73 if (info->is_load_timing_enabled()) | 74 if (info->is_load_timing_enabled()) |
74 request->GetLoadTimingInfo(&response->head.load_timing); | 75 request->GetLoadTimingInfo(&response->head.load_timing); |
(...skipping 629 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
704 UMA_HISTOGRAM_ENUMERATION("Net.Prefetch.Pattern", status, STATUS_MAX); | 705 UMA_HISTOGRAM_ENUMERATION("Net.Prefetch.Pattern", status, STATUS_MAX); |
705 } | 706 } |
706 } | 707 } |
707 | 708 |
708 void ResourceLoader::ContinueWithCertificate(net::X509Certificate* cert) { | 709 void ResourceLoader::ContinueWithCertificate(net::X509Certificate* cert) { |
709 ssl_client_auth_handler_.reset(); | 710 ssl_client_auth_handler_.reset(); |
710 request_->ContinueWithCertificate(cert); | 711 request_->ContinueWithCertificate(cert); |
711 } | 712 } |
712 | 713 |
713 } // namespace content | 714 } // namespace content |
OLD | NEW |