Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(96)

Side by Side Diff: net/http/http_proxy_client_socket_pool.cc

Issue 9959033: Move NextProto enum to a new file net/socket/next_proto.h (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: Address wtc's comments Created 8 years, 8 months ago
Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.
Jump to:
View unified diff | Download patch | Annotate | Revision Log
OLDNEW
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_proxy_client_socket_pool.h" 5 #include "net/http/http_proxy_client_socket_pool.h"
6 6
7 #include <algorithm> 7 #include <algorithm>
8 8
9 #include "base/time.h" 9 #include "base/time.h"
10 #include "base/values.h" 10 #include "base/values.h"
(...skipping 71 matching lines...) Expand 10 before | Expand all | Expand 10 after
82 : ConnectJob(group_name, timeout_duration, delegate, 82 : ConnectJob(group_name, timeout_duration, delegate,
83 BoundNetLog::Make(net_log, NetLog::SOURCE_CONNECT_JOB)), 83 BoundNetLog::Make(net_log, NetLog::SOURCE_CONNECT_JOB)),
84 params_(params), 84 params_(params),
85 transport_pool_(transport_pool), 85 transport_pool_(transport_pool),
86 ssl_pool_(ssl_pool), 86 ssl_pool_(ssl_pool),
87 resolver_(host_resolver), 87 resolver_(host_resolver),
88 ALLOW_THIS_IN_INITIALIZER_LIST( 88 ALLOW_THIS_IN_INITIALIZER_LIST(
89 callback_(base::Bind(&HttpProxyConnectJob::OnIOComplete, 89 callback_(base::Bind(&HttpProxyConnectJob::OnIOComplete,
90 base::Unretained(this)))), 90 base::Unretained(this)))),
91 using_spdy_(false), 91 using_spdy_(false),
92 protocol_negotiated_(SSLClientSocket::kProtoUnknown) { 92 protocol_negotiated_(kProtoUnknown) {
93 } 93 }
94 94
95 HttpProxyConnectJob::~HttpProxyConnectJob() {} 95 HttpProxyConnectJob::~HttpProxyConnectJob() {}
96 96
97 LoadState HttpProxyConnectJob::GetLoadState() const { 97 LoadState HttpProxyConnectJob::GetLoadState() const {
98 switch (next_state_) { 98 switch (next_state_) {
99 case STATE_TCP_CONNECT: 99 case STATE_TCP_CONNECT:
100 case STATE_TCP_CONNECT_COMPLETE: 100 case STATE_TCP_CONNECT_COMPLETE:
101 case STATE_SSL_CONNECT: 101 case STATE_SSL_CONNECT:
102 case STATE_SSL_CONNECT_COMPLETE: 102 case STATE_SSL_CONNECT_COMPLETE:
(...skipping 377 matching lines...) Expand 10 before | Expand all | Expand 10 after
480 480
481 base::TimeDelta HttpProxyClientSocketPool::ConnectionTimeout() const { 481 base::TimeDelta HttpProxyClientSocketPool::ConnectionTimeout() const {
482 return base_.ConnectionTimeout(); 482 return base_.ConnectionTimeout();
483 } 483 }
484 484
485 ClientSocketPoolHistograms* HttpProxyClientSocketPool::histograms() const { 485 ClientSocketPoolHistograms* HttpProxyClientSocketPool::histograms() const {
486 return base_.histograms(); 486 return base_.histograms();
487 } 487 }
488 488
489 } // namespace net 489 } // namespace net
OLDNEW
« no previous file with comments | « net/http/http_proxy_client_socket_pool.h ('k') | net/http/http_proxy_client_socket_pool_spdy21_unittest.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698