| 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_stream_factory_impl_job.h" | 5 #include "net/http/http_stream_factory_impl_job.h" |
| 6 | 6 |
| 7 #include <algorithm> | 7 #include <algorithm> |
| 8 #include <string> | 8 #include <string> |
| 9 | 9 |
| 10 #include "base/bind.h" | 10 #include "base/bind.h" |
| (...skipping 510 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 521 DCHECK_NE(job_type_, PRECONNECT); | 521 DCHECK_NE(job_type_, PRECONNECT); |
| 522 | 522 |
| 523 delegate_->OnHttpsProxyTunnelResponse(this, response_info, server_ssl_config_, | 523 delegate_->OnHttpsProxyTunnelResponse(this, response_info, server_ssl_config_, |
| 524 proxy_info_, stream); | 524 proxy_info_, stream); |
| 525 // |this| may be deleted after this call. | 525 // |this| may be deleted after this call. |
| 526 } | 526 } |
| 527 | 527 |
| 528 void HttpStreamFactoryImpl::Job::OnPreconnectsComplete() { | 528 void HttpStreamFactoryImpl::Job::OnPreconnectsComplete() { |
| 529 DCHECK(!new_spdy_session_); | 529 DCHECK(!new_spdy_session_); |
| 530 | 530 |
| 531 if (new_spdy_session_.get()) { | |
| 532 delegate_->OnNewSpdySessionReady(this, new_spdy_session_, | |
| 533 spdy_session_direct_); | |
| 534 } | |
| 535 delegate_->OnPreconnectsComplete(this); | 531 delegate_->OnPreconnectsComplete(this); |
| 536 // |this| may be deleted after this call. | 532 // |this| may be deleted after this call. |
| 537 } | 533 } |
| 538 | 534 |
| 539 // static | 535 // static |
| 540 int HttpStreamFactoryImpl::Job::OnHostResolution( | 536 int HttpStreamFactoryImpl::Job::OnHostResolution( |
| 541 SpdySessionPool* spdy_session_pool, | 537 SpdySessionPool* spdy_session_pool, |
| 542 const SpdySessionKey& spdy_session_key, | 538 const SpdySessionKey& spdy_session_key, |
| 543 const GURL& origin_url, | 539 const GURL& origin_url, |
| 544 bool enable_ip_based_pooling, | 540 bool enable_ip_based_pooling, |
| (...skipping 1019 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 1564 | 1560 |
| 1565 ConnectionAttempts socket_attempts = connection_->connection_attempts(); | 1561 ConnectionAttempts socket_attempts = connection_->connection_attempts(); |
| 1566 if (connection_->socket()) { | 1562 if (connection_->socket()) { |
| 1567 connection_->socket()->GetConnectionAttempts(&socket_attempts); | 1563 connection_->socket()->GetConnectionAttempts(&socket_attempts); |
| 1568 } | 1564 } |
| 1569 | 1565 |
| 1570 delegate_->AddConnectionAttemptsToRequest(this, socket_attempts); | 1566 delegate_->AddConnectionAttemptsToRequest(this, socket_attempts); |
| 1571 } | 1567 } |
| 1572 | 1568 |
| 1573 } // namespace net | 1569 } // namespace net |
| OLD | NEW |