| 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 477 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 488 response_.was_npn_negotiated = stream_request_->was_npn_negotiated(); | 488 response_.was_npn_negotiated = stream_request_->was_npn_negotiated(); |
| 489 response_.npn_negotiated_protocol = SSLClientSocket::NextProtoToString( | 489 response_.npn_negotiated_protocol = SSLClientSocket::NextProtoToString( |
| 490 stream_request_->protocol_negotiated()); | 490 stream_request_->protocol_negotiated()); |
| 491 response_.was_fetched_via_spdy = stream_request_->using_spdy(); | 491 response_.was_fetched_via_spdy = stream_request_->using_spdy(); |
| 492 response_.was_fetched_via_proxy = !proxy_info_.is_direct(); | 492 response_.was_fetched_via_proxy = !proxy_info_.is_direct(); |
| 493 if (response_.was_fetched_via_proxy && !proxy_info_.is_empty()) | 493 if (response_.was_fetched_via_proxy && !proxy_info_.is_empty()) |
| 494 response_.proxy_server = proxy_info_.proxy_server().host_port_pair(); | 494 response_.proxy_server = proxy_info_.proxy_server().host_port_pair(); |
| 495 OnIOComplete(OK); | 495 OnIOComplete(OK); |
| 496 } | 496 } |
| 497 | 497 |
| 498 void HttpNetworkTransaction::OnBidirectionalStreamJobReady( | 498 void HttpNetworkTransaction::OnBidirectionalStreamImplReady( |
| 499 const SSLConfig& used_ssl_config, | 499 const SSLConfig& used_ssl_config, |
| 500 const ProxyInfo& used_proxy_info, | 500 const ProxyInfo& used_proxy_info, |
| 501 BidirectionalStreamJob* stream_job) { | 501 BidirectionalStreamImpl* stream) { |
| 502 NOTREACHED(); | 502 NOTREACHED(); |
| 503 } | 503 } |
| 504 | 504 |
| 505 void HttpNetworkTransaction::OnWebSocketHandshakeStreamReady( | 505 void HttpNetworkTransaction::OnWebSocketHandshakeStreamReady( |
| 506 const SSLConfig& used_ssl_config, | 506 const SSLConfig& used_ssl_config, |
| 507 const ProxyInfo& used_proxy_info, | 507 const ProxyInfo& used_proxy_info, |
| 508 WebSocketHandshakeStreamBase* stream) { | 508 WebSocketHandshakeStreamBase* stream) { |
| 509 OnStreamReady(used_ssl_config, used_proxy_info, stream); | 509 OnStreamReady(used_ssl_config, used_proxy_info, stream); |
| 510 } | 510 } |
| 511 | 511 |
| (...skipping 1243 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 1755 DCHECK(stream_request_); | 1755 DCHECK(stream_request_); |
| 1756 | 1756 |
| 1757 // Since the transaction can restart with auth credentials, it may create a | 1757 // Since the transaction can restart with auth credentials, it may create a |
| 1758 // stream more than once. Accumulate all of the connection attempts across | 1758 // stream more than once. Accumulate all of the connection attempts across |
| 1759 // those streams by appending them to the vector: | 1759 // those streams by appending them to the vector: |
| 1760 for (const auto& attempt : stream_request_->connection_attempts()) | 1760 for (const auto& attempt : stream_request_->connection_attempts()) |
| 1761 connection_attempts_.push_back(attempt); | 1761 connection_attempts_.push_back(attempt); |
| 1762 } | 1762 } |
| 1763 | 1763 |
| 1764 } // namespace net | 1764 } // namespace net |
| OLD | NEW |