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

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

Issue 2351513002: net: rename BoundNetLog to NetLogWithSource (Closed)
Patch Set: one more fix, content bound_net_log_ Created 4 years, 3 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
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_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 <memory> 8 #include <memory>
9 #include <string> 9 #include <string>
10 10
(...skipping 106 matching lines...) Expand 10 before | Expand all | Expand 10 after
117 117
118 ~SOCKSClientSocketPool() override; 118 ~SOCKSClientSocketPool() override;
119 119
120 // ClientSocketPool implementation. 120 // ClientSocketPool implementation.
121 int RequestSocket(const std::string& group_name, 121 int RequestSocket(const std::string& group_name,
122 const void* connect_params, 122 const void* connect_params,
123 RequestPriority priority, 123 RequestPriority priority,
124 RespectLimits respect_limits, 124 RespectLimits respect_limits,
125 ClientSocketHandle* handle, 125 ClientSocketHandle* handle,
126 const CompletionCallback& callback, 126 const CompletionCallback& callback,
127 const BoundNetLog& net_log) override; 127 const NetLogWithSource& net_log) override;
128 128
129 void RequestSockets(const std::string& group_name, 129 void RequestSockets(const std::string& group_name,
130 const void* params, 130 const void* params,
131 int num_sockets, 131 int num_sockets,
132 const BoundNetLog& net_log) override; 132 const NetLogWithSource& net_log) override;
133 133
134 void CancelRequest(const std::string& group_name, 134 void CancelRequest(const std::string& group_name,
135 ClientSocketHandle* handle) override; 135 ClientSocketHandle* handle) override;
136 136
137 void ReleaseSocket(const std::string& group_name, 137 void ReleaseSocket(const std::string& group_name,
138 std::unique_ptr<StreamSocket> socket, 138 std::unique_ptr<StreamSocket> socket,
139 int id) override; 139 int id) override;
140 140
141 void FlushWithError(int error) override; 141 void FlushWithError(int error) override;
142 142
(...skipping 55 matching lines...) Expand 10 before | Expand all | Expand 10 after
198 198
199 TransportClientSocketPool* const transport_pool_; 199 TransportClientSocketPool* const transport_pool_;
200 PoolBase base_; 200 PoolBase base_;
201 201
202 DISALLOW_COPY_AND_ASSIGN(SOCKSClientSocketPool); 202 DISALLOW_COPY_AND_ASSIGN(SOCKSClientSocketPool);
203 }; 203 };
204 204
205 } // namespace net 205 } // namespace net
206 206
207 #endif // NET_SOCKET_SOCKS_CLIENT_SOCKET_POOL_H_ 207 #endif // NET_SOCKET_SOCKS_CLIENT_SOCKET_POOL_H_
OLDNEW

Powered by Google App Engine
This is Rietveld 408576698