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 37 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
48 request->GetCharset(&response->head.charset); | 48 request->GetCharset(&response->head.charset); |
49 response->head.content_length = request->GetExpectedContentSize(); | 49 response->head.content_length = request->GetExpectedContentSize(); |
50 request->GetMimeType(&response->head.mime_type); | 50 request->GetMimeType(&response->head.mime_type); |
51 net::HttpResponseInfo response_info = request->response_info(); | 51 net::HttpResponseInfo response_info = request->response_info(); |
52 response->head.was_fetched_via_spdy = response_info.was_fetched_via_spdy; | 52 response->head.was_fetched_via_spdy = response_info.was_fetched_via_spdy; |
53 response->head.was_npn_negotiated = response_info.was_npn_negotiated; | 53 response->head.was_npn_negotiated = response_info.was_npn_negotiated; |
54 response->head.npn_negotiated_protocol = | 54 response->head.npn_negotiated_protocol = |
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.proxy_server = response_info.proxy_server; | |
59 response->head.socket_address = request->GetSocketAddress(); | 58 response->head.socket_address = request->GetSocketAddress(); |
60 if (ServiceWorkerRequestHandler* handler = | 59 if (ServiceWorkerRequestHandler* handler = |
61 ServiceWorkerRequestHandler::GetHandler(request)) { | 60 ServiceWorkerRequestHandler::GetHandler(request)) { |
62 handler->GetExtraResponseInfo( | 61 handler->GetExtraResponseInfo( |
63 &response->head.was_fetched_via_service_worker, | 62 &response->head.was_fetched_via_service_worker, |
64 &response->head.was_fallback_required_by_service_worker, | 63 &response->head.was_fallback_required_by_service_worker, |
65 &response->head.original_url_via_service_worker, | 64 &response->head.original_url_via_service_worker, |
66 &response->head.response_type_via_service_worker, | 65 &response->head.response_type_via_service_worker, |
67 &response->head.service_worker_fetch_start, | 66 &response->head.service_worker_fetch_start, |
68 &response->head.service_worker_fetch_ready, | 67 &response->head.service_worker_fetch_ready, |
(...skipping 638 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
707 UMA_HISTOGRAM_ENUMERATION("Net.Prefetch.Pattern", status, STATUS_MAX); | 706 UMA_HISTOGRAM_ENUMERATION("Net.Prefetch.Pattern", status, STATUS_MAX); |
708 } | 707 } |
709 } | 708 } |
710 | 709 |
711 void ResourceLoader::ContinueWithCertificate(net::X509Certificate* cert) { | 710 void ResourceLoader::ContinueWithCertificate(net::X509Certificate* cert) { |
712 ssl_client_auth_handler_.reset(); | 711 ssl_client_auth_handler_.reset(); |
713 request_->ContinueWithCertificate(cert); | 712 request_->ContinueWithCertificate(cert); |
714 } | 713 } |
715 | 714 |
716 } // namespace content | 715 } // namespace content |
OLD | NEW |