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

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

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
« no previous file with comments | « net/http/http_proxy_client_socket.cc ('k') | net/http/http_proxy_client_socket_pool.cc » ('j') | no next file with comments »
Toggle Intra-line Diffs ('i') | Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
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 #ifndef NET_HTTP_HTTP_PROXY_CLIENT_SOCKET_POOL_H_ 5 #ifndef NET_HTTP_HTTP_PROXY_CLIENT_SOCKET_POOL_H_
6 #define NET_HTTP_HTTP_PROXY_CLIENT_SOCKET_POOL_H_ 6 #define NET_HTTP_HTTP_PROXY_CLIENT_SOCKET_POOL_H_
7 #pragma once 7 #pragma once
8 8
9 #include <string> 9 #include <string>
10 10
(...skipping 143 matching lines...) Expand 10 before | Expand all | Expand 10 after
154 TransportClientSocketPool* const transport_pool_; 154 TransportClientSocketPool* const transport_pool_;
155 SSLClientSocketPool* const ssl_pool_; 155 SSLClientSocketPool* const ssl_pool_;
156 HostResolver* const resolver_; 156 HostResolver* const resolver_;
157 157
158 State next_state_; 158 State next_state_;
159 CompletionCallback callback_; 159 CompletionCallback callback_;
160 scoped_ptr<ClientSocketHandle> transport_socket_handle_; 160 scoped_ptr<ClientSocketHandle> transport_socket_handle_;
161 scoped_ptr<ProxyClientSocket> transport_socket_; 161 scoped_ptr<ProxyClientSocket> transport_socket_;
162 bool using_spdy_; 162 bool using_spdy_;
163 // Protocol negotiated with the server. 163 // Protocol negotiated with the server.
164 SSLClientSocket::NextProto protocol_negotiated_; 164 NextProto protocol_negotiated_;
165 165
166 HttpResponseInfo error_response_info_; 166 HttpResponseInfo error_response_info_;
167 167
168 scoped_refptr<SpdyStream> spdy_stream_; 168 scoped_refptr<SpdyStream> spdy_stream_;
169 169
170 DISALLOW_COPY_AND_ASSIGN(HttpProxyConnectJob); 170 DISALLOW_COPY_AND_ASSIGN(HttpProxyConnectJob);
171 }; 171 };
172 172
173 class NET_EXPORT_PRIVATE HttpProxyClientSocketPool : public ClientSocketPool { 173 class NET_EXPORT_PRIVATE HttpProxyClientSocketPool : public ClientSocketPool {
174 public: 174 public:
(...skipping 87 matching lines...) Expand 10 before | Expand all | Expand 10 after
262 262
263 DISALLOW_COPY_AND_ASSIGN(HttpProxyClientSocketPool); 263 DISALLOW_COPY_AND_ASSIGN(HttpProxyClientSocketPool);
264 }; 264 };
265 265
266 REGISTER_SOCKET_PARAMS_FOR_POOL(HttpProxyClientSocketPool, 266 REGISTER_SOCKET_PARAMS_FOR_POOL(HttpProxyClientSocketPool,
267 HttpProxySocketParams); 267 HttpProxySocketParams);
268 268
269 } // namespace net 269 } // namespace net
270 270
271 #endif // NET_HTTP_HTTP_PROXY_CLIENT_SOCKET_POOL_H_ 271 #endif // NET_HTTP_HTTP_PROXY_CLIENT_SOCKET_POOL_H_
OLDNEW
« no previous file with comments | « net/http/http_proxy_client_socket.cc ('k') | net/http/http_proxy_client_socket_pool.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698