diff options
Diffstat (limited to 'net/socket/socks_client_socket.h')
| -rw-r--r-- | net/socket/socks_client_socket.h | 11 |
1 files changed, 2 insertions, 9 deletions
diff --git a/net/socket/socks_client_socket.h b/net/socket/socks_client_socket.h index 1a4a75c..fb88cd2 100644 --- a/net/socket/socks_client_socket.h +++ b/net/socket/socks_client_socket.h @@ -48,8 +48,7 @@ class NET_EXPORT_PRIVATE SOCKSClientSocket : public StreamSocket { // StreamSocket implementation. // Does the SOCKS handshake and completes the protocol. - virtual int Connect(OldCompletionCallback* callback) OVERRIDE; - virtual int Connect(const net::CompletionCallback& callback) OVERRIDE; + virtual int Connect(const CompletionCallback& callback) OVERRIDE; virtual void Disconnect() OVERRIDE; virtual bool IsConnected() const OVERRIDE; virtual bool IsConnectedAndIdle() const OVERRIDE; @@ -64,13 +63,10 @@ class NET_EXPORT_PRIVATE SOCKSClientSocket : public StreamSocket { // Socket implementation. virtual int Read(IOBuffer* buf, int buf_len, - OldCompletionCallback* callback) OVERRIDE; - virtual int Read(IOBuffer* buf, - int buf_len, const CompletionCallback& callback) OVERRIDE; virtual int Write(IOBuffer* buf, int buf_len, - OldCompletionCallback* callback) OVERRIDE; + const CompletionCallback& callback) OVERRIDE; virtual bool SetReceiveBufferSize(int32 size) OVERRIDE; virtual bool SetSendBufferSize(int32 size) OVERRIDE; @@ -106,15 +102,12 @@ class NET_EXPORT_PRIVATE SOCKSClientSocket : public StreamSocket { const std::string BuildHandshakeWriteBuffer() const; - OldCompletionCallbackImpl<SOCKSClientSocket> io_callback_; - // Stores the underlying socket. scoped_ptr<ClientSocketHandle> transport_; State next_state_; // Stores the callback to the layer above, called on completing Connect(). - OldCompletionCallback* old_user_callback_; CompletionCallback user_callback_; // This IOBuffer is used by the class to read and write |