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 "net/http/http_network_transaction.h" | 5 #include "net/http/http_network_transaction.h" |
6 | 6 |
7 #include <set> | 7 #include <set> |
8 #include <utility> | 8 #include <utility> |
9 #include <vector> | 9 #include <vector> |
10 | 10 |
(...skipping 515 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
526 response_.was_npn_negotiated = stream_request_->was_npn_negotiated(); | 526 response_.was_npn_negotiated = stream_request_->was_npn_negotiated(); |
527 response_.npn_negotiated_protocol = SSLClientSocket::NextProtoToString( | 527 response_.npn_negotiated_protocol = SSLClientSocket::NextProtoToString( |
528 stream_request_->protocol_negotiated()); | 528 stream_request_->protocol_negotiated()); |
529 response_.was_fetched_via_spdy = stream_request_->using_spdy(); | 529 response_.was_fetched_via_spdy = stream_request_->using_spdy(); |
530 response_.was_fetched_via_proxy = !proxy_info_.is_direct(); | 530 response_.was_fetched_via_proxy = !proxy_info_.is_direct(); |
531 if (response_.was_fetched_via_proxy && !proxy_info_.is_empty()) | 531 if (response_.was_fetched_via_proxy && !proxy_info_.is_empty()) |
532 response_.proxy_server = proxy_info_.proxy_server().host_port_pair(); | 532 response_.proxy_server = proxy_info_.proxy_server().host_port_pair(); |
533 OnIOComplete(OK); | 533 OnIOComplete(OK); |
534 } | 534 } |
535 | 535 |
536 void HttpNetworkTransaction::OnBidirectionalStreamJobReady( | 536 void HttpNetworkTransaction::OnBidirectionalStreamImplReady( |
537 const SSLConfig& used_ssl_config, | 537 const SSLConfig& used_ssl_config, |
538 const ProxyInfo& used_proxy_info, | 538 const ProxyInfo& used_proxy_info, |
539 BidirectionalStreamJob* stream_job) { | 539 BidirectionalStreamImpl* stream) { |
540 NOTREACHED(); | 540 NOTREACHED(); |
541 } | 541 } |
542 | 542 |
543 void HttpNetworkTransaction::OnWebSocketHandshakeStreamReady( | 543 void HttpNetworkTransaction::OnWebSocketHandshakeStreamReady( |
544 const SSLConfig& used_ssl_config, | 544 const SSLConfig& used_ssl_config, |
545 const ProxyInfo& used_proxy_info, | 545 const ProxyInfo& used_proxy_info, |
546 WebSocketHandshakeStreamBase* stream) { | 546 WebSocketHandshakeStreamBase* stream) { |
547 OnStreamReady(used_ssl_config, used_proxy_info, stream); | 547 OnStreamReady(used_ssl_config, used_proxy_info, stream); |
548 } | 548 } |
549 | 549 |
(...skipping 1243 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
1793 DCHECK(stream_request_); | 1793 DCHECK(stream_request_); |
1794 | 1794 |
1795 // Since the transaction can restart with auth credentials, it may create a | 1795 // Since the transaction can restart with auth credentials, it may create a |
1796 // stream more than once. Accumulate all of the connection attempts across | 1796 // stream more than once. Accumulate all of the connection attempts across |
1797 // those streams by appending them to the vector: | 1797 // those streams by appending them to the vector: |
1798 for (const auto& attempt : stream_request_->connection_attempts()) | 1798 for (const auto& attempt : stream_request_->connection_attempts()) |
1799 connection_attempts_.push_back(attempt); | 1799 connection_attempts_.push_back(attempt); |
1800 } | 1800 } |
1801 | 1801 |
1802 } // namespace net | 1802 } // namespace net |
OLD | NEW |