| Index: net/socket/tcp_client_socket_win.h
|
| diff --git a/net/socket/tcp_client_socket_win.h b/net/socket/tcp_client_socket_win.h
|
| index 59ab3b4559e98781a7e9d076f4273bd46acca2c3..bda2585d9098b491b0a347a1164d9c5338b5a3a1 100644
|
| --- a/net/socket/tcp_client_socket_win.h
|
| +++ b/net/socket/tcp_client_socket_win.h
|
| @@ -41,8 +41,9 @@ class NET_EXPORT TCPClientSocketWin : public StreamSocket,
|
| // Binds the socket to a local IP address and port.
|
| int Bind(const IPEndPoint& address);
|
|
|
| - // StreamSocket methods:
|
| + // StreamSocket implementation.
|
| virtual int Connect(OldCompletionCallback* callback);
|
| + virtual int Connect(const CompletionCallback& callback);
|
| virtual void Disconnect();
|
| virtual bool IsConnected() const;
|
| virtual bool IsConnectedAndIdle() const;
|
| @@ -56,7 +57,7 @@ class NET_EXPORT TCPClientSocketWin : public StreamSocket,
|
| virtual int64 NumBytesRead() const;
|
| virtual base::TimeDelta GetConnectTimeMicros() const;
|
|
|
| - // Socket methods:
|
| + // Socket implementation.
|
| // Multiple outstanding requests are not supported.
|
| // Full duplex mode (reading and writing at the same time) is supported
|
| virtual int Read(IOBuffer* buf, int buf_len, OldCompletionCallback* callback);
|
| @@ -123,7 +124,8 @@ class NET_EXPORT TCPClientSocketWin : public StreamSocket,
|
| scoped_refptr<Core> core_;
|
|
|
| // External callback; called when connect or read is complete.
|
| - OldCompletionCallback* read_callback_;
|
| + OldCompletionCallback* old_read_callback_;
|
| + CompletionCallback read_callback_;
|
|
|
| // External callback; called when write is complete.
|
| OldCompletionCallback* write_callback_;
|
|
|