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

Side by Side Diff: net/socket/socks_client_socket_pool.h

Issue 1604045: Fix crash on IP address change. (Closed)
Patch Set: Merge conflict Created 10 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
« no previous file with comments | « net/socket/client_socket_pool_base_unittest.cc ('k') | net/socket/socks_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) 2010 The Chromium Authors. All rights reserved. 1 // Copyright (c) 2010 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_SOCKET_SOCKS_CLIENT_SOCKET_POOL_H_ 5 #ifndef NET_SOCKET_SOCKS_CLIENT_SOCKET_POOL_H_
6 #define NET_SOCKET_SOCKS_CLIENT_SOCKET_POOL_H_ 6 #define NET_SOCKET_SOCKS_CLIENT_SOCKET_POOL_H_
7 7
8 #include <string> 8 #include <string>
9 9
10 #include "base/basictypes.h" 10 #include "base/basictypes.h"
(...skipping 90 matching lines...) Expand 10 before | Expand all | Expand 10 after
101 DISALLOW_COPY_AND_ASSIGN(SOCKSConnectJob); 101 DISALLOW_COPY_AND_ASSIGN(SOCKSConnectJob);
102 }; 102 };
103 103
104 class SOCKSClientSocketPool : public ClientSocketPool { 104 class SOCKSClientSocketPool : public ClientSocketPool {
105 public: 105 public:
106 SOCKSClientSocketPool( 106 SOCKSClientSocketPool(
107 int max_sockets, 107 int max_sockets,
108 int max_sockets_per_group, 108 int max_sockets_per_group,
109 const std::string& name, 109 const std::string& name,
110 const scoped_refptr<HostResolver>& host_resolver, 110 const scoped_refptr<HostResolver>& host_resolver,
111 const scoped_refptr<TCPClientSocketPool>& tcp_pool); 111 const scoped_refptr<TCPClientSocketPool>& tcp_pool,
112 NetworkChangeNotifier* network_change_notifier);
112 113
113 // ClientSocketPool methods: 114 // ClientSocketPool methods:
114 virtual int RequestSocket(const std::string& group_name, 115 virtual int RequestSocket(const std::string& group_name,
115 const void* connect_params, 116 const void* connect_params,
116 RequestPriority priority, 117 RequestPriority priority,
117 ClientSocketHandle* handle, 118 ClientSocketHandle* handle,
118 CompletionCallback* callback, 119 CompletionCallback* callback,
119 const BoundNetLog& net_log); 120 const BoundNetLog& net_log);
120 121
121 virtual void CancelRequest(const std::string& group_name, 122 virtual void CancelRequest(const std::string& group_name,
(...skipping 53 matching lines...) Expand 10 before | Expand all | Expand 10 after
175 PoolBase base_; 176 PoolBase base_;
176 177
177 DISALLOW_COPY_AND_ASSIGN(SOCKSClientSocketPool); 178 DISALLOW_COPY_AND_ASSIGN(SOCKSClientSocketPool);
178 }; 179 };
179 180
180 REGISTER_SOCKET_PARAMS_FOR_POOL(SOCKSClientSocketPool, SOCKSSocketParams) 181 REGISTER_SOCKET_PARAMS_FOR_POOL(SOCKSClientSocketPool, SOCKSSocketParams)
181 182
182 } // namespace net 183 } // namespace net
183 184
184 #endif // NET_SOCKET_SOCKS_CLIENT_SOCKET_POOL_H_ 185 #endif // NET_SOCKET_SOCKS_CLIENT_SOCKET_POOL_H_
OLDNEW
« no previous file with comments | « net/socket/client_socket_pool_base_unittest.cc ('k') | net/socket/socks_client_socket_pool.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698