| 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 <vector> | 8 #include <vector> |
| 9 | 9 |
| 10 #include "base/bind.h" | 10 #include "base/bind.h" |
| (...skipping 401 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 412 load_timing_info->proxy_resolve_start = | 412 load_timing_info->proxy_resolve_start = |
| 413 proxy_info_.proxy_resolve_start_time(); | 413 proxy_info_.proxy_resolve_start_time(); |
| 414 load_timing_info->proxy_resolve_end = proxy_info_.proxy_resolve_end_time(); | 414 load_timing_info->proxy_resolve_end = proxy_info_.proxy_resolve_end_time(); |
| 415 load_timing_info->send_start = send_start_time_; | 415 load_timing_info->send_start = send_start_time_; |
| 416 load_timing_info->send_end = send_end_time_; | 416 load_timing_info->send_end = send_end_time_; |
| 417 return true; | 417 return true; |
| 418 } | 418 } |
| 419 | 419 |
| 420 void HttpNetworkTransaction::SetPriority(RequestPriority priority) { | 420 void HttpNetworkTransaction::SetPriority(RequestPriority priority) { |
| 421 priority_ = priority; | 421 priority_ = priority; |
| 422 // TODO(akalin): Plumb this through to |stream_request_| and | 422 if (stream_request_) |
| 423 // |stream_|. | 423 stream_request_->SetPriority(priority); |
| 424 // TODO(akalin): Plumb this through to |stream_| also. |
| 424 } | 425 } |
| 425 | 426 |
| 426 void HttpNetworkTransaction::OnStreamReady(const SSLConfig& used_ssl_config, | 427 void HttpNetworkTransaction::OnStreamReady(const SSLConfig& used_ssl_config, |
| 427 const ProxyInfo& used_proxy_info, | 428 const ProxyInfo& used_proxy_info, |
| 428 HttpStreamBase* stream) { | 429 HttpStreamBase* stream) { |
| 429 DCHECK_EQ(STATE_CREATE_STREAM_COMPLETE, next_state_); | 430 DCHECK_EQ(STATE_CREATE_STREAM_COMPLETE, next_state_); |
| 430 DCHECK(stream_request_.get()); | 431 DCHECK(stream_request_.get()); |
| 431 | 432 |
| 432 stream_.reset(stream); | 433 stream_.reset(stream); |
| 433 server_ssl_config_ = used_ssl_config; | 434 server_ssl_config_ = used_ssl_config; |
| (...skipping 1043 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 1477 description = base::StringPrintf("Unknown state 0x%08X (%u)", state, | 1478 description = base::StringPrintf("Unknown state 0x%08X (%u)", state, |
| 1478 state); | 1479 state); |
| 1479 break; | 1480 break; |
| 1480 } | 1481 } |
| 1481 return description; | 1482 return description; |
| 1482 } | 1483 } |
| 1483 | 1484 |
| 1484 #undef STATE_CASE | 1485 #undef STATE_CASE |
| 1485 | 1486 |
| 1486 } // namespace net | 1487 } // namespace net |
| OLD | NEW |