diff options
| author | willchan@chromium.org <willchan@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2011-10-01 20:38:10 +0000 |
|---|---|---|
| committer | willchan@chromium.org <willchan@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2011-10-01 20:38:10 +0000 |
| commit | f1f3f0f8af3740ec2afaebcaed410950a9cc0ac8 (patch) | |
| tree | 6ccdd87ccfc89adbcb372c517559fa61fbc6c6b2 /net/socket/socks_client_socket.h | |
| parent | d1666539b57bf8552e203d355fd09909d36f9732 (diff) | |
| download | chromium_src-f1f3f0f8af3740ec2afaebcaed410950a9cc0ac8.zip chromium_src-f1f3f0f8af3740ec2afaebcaed410950a9cc0ac8.tar.gz chromium_src-f1f3f0f8af3740ec2afaebcaed410950a9cc0ac8.tar.bz2 | |
Begin CompletionCallback switchover.
Rename CompletionCallback to OldCompletionCallback in preparation for introducing a new CompletionCallback based on base::Callback.
Also renames other CompletionCallback types like CancelableCompletionCallback and TestCompletionCallback and CompletionCallbackImpl. All using sed with s/CompletionCallback/OldCompletionCallback/g.
BUG=98719
TEST=none
Review URL: http://codereview.chromium.org/8070013
git-svn-id: svn://svn.chromium.org/chrome/trunk/src@103650 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'net/socket/socks_client_socket.h')
| -rw-r--r-- | net/socket/socks_client_socket.h | 10 |
1 files changed, 5 insertions, 5 deletions
diff --git a/net/socket/socks_client_socket.h b/net/socket/socks_client_socket.h index f7929b5..a7aff1c 100644 --- a/net/socket/socks_client_socket.h +++ b/net/socket/socks_client_socket.h @@ -49,7 +49,7 @@ class NET_EXPORT_PRIVATE SOCKSClientSocket : public StreamSocket { // StreamSocket methods: // Does the SOCKS handshake and completes the protocol. - virtual int Connect(CompletionCallback* callback); + virtual int Connect(OldCompletionCallback* callback); virtual void Disconnect(); virtual bool IsConnected() const; virtual bool IsConnectedAndIdle() const; @@ -62,8 +62,8 @@ class NET_EXPORT_PRIVATE SOCKSClientSocket : public StreamSocket { virtual base::TimeDelta GetConnectTimeMicros() const; // Socket methods: - virtual int Read(IOBuffer* buf, int buf_len, CompletionCallback* callback); - virtual int Write(IOBuffer* buf, int buf_len, CompletionCallback* callback); + virtual int Read(IOBuffer* buf, int buf_len, OldCompletionCallback* callback); + virtual int Write(IOBuffer* buf, int buf_len, OldCompletionCallback* callback); virtual bool SetReceiveBufferSize(int32 size); virtual bool SetSendBufferSize(int32 size); @@ -99,7 +99,7 @@ class NET_EXPORT_PRIVATE SOCKSClientSocket : public StreamSocket { const std::string BuildHandshakeWriteBuffer() const; - CompletionCallbackImpl<SOCKSClientSocket> io_callback_; + OldCompletionCallbackImpl<SOCKSClientSocket> io_callback_; // Stores the underlying socket. scoped_ptr<ClientSocketHandle> transport_; @@ -107,7 +107,7 @@ class NET_EXPORT_PRIVATE SOCKSClientSocket : public StreamSocket { State next_state_; // Stores the callback to the layer above, called on completing Connect(). - CompletionCallback* user_callback_; + OldCompletionCallback* user_callback_; // This IOBuffer is used by the class to read and write // SOCKS handshake data. The length contains the expected size to |