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/udp/udp_socket_win.cc | |
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/udp/udp_socket_win.cc')
-rw-r--r-- | net/udp/udp_socket_win.cc | 14 |
1 files changed, 7 insertions, 7 deletions
diff --git a/net/udp/udp_socket_win.cc b/net/udp/udp_socket_win.cc index fe7eaae..49f2f44 100644 --- a/net/udp/udp_socket_win.cc +++ b/net/udp/udp_socket_win.cc @@ -134,14 +134,14 @@ int UDPSocketWin::GetLocalAddress(IPEndPoint* address) const { int UDPSocketWin::Read(IOBuffer* buf, int buf_len, - CompletionCallback* callback) { + OldCompletionCallback* callback) { return RecvFrom(buf, buf_len, NULL, callback); } int UDPSocketWin::RecvFrom(IOBuffer* buf, int buf_len, IPEndPoint* address, - CompletionCallback* callback) { + OldCompletionCallback* callback) { DCHECK(CalledOnValidThread()); DCHECK_NE(INVALID_SOCKET, socket_); DCHECK(!read_callback_); @@ -161,21 +161,21 @@ int UDPSocketWin::RecvFrom(IOBuffer* buf, int UDPSocketWin::Write(IOBuffer* buf, int buf_len, - CompletionCallback* callback) { + OldCompletionCallback* callback) { return SendToOrWrite(buf, buf_len, NULL, callback); } int UDPSocketWin::SendTo(IOBuffer* buf, int buf_len, const IPEndPoint& address, - CompletionCallback* callback) { + OldCompletionCallback* callback) { return SendToOrWrite(buf, buf_len, &address, callback); } int UDPSocketWin::SendToOrWrite(IOBuffer* buf, int buf_len, const IPEndPoint* address, - CompletionCallback* callback) { + OldCompletionCallback* callback) { DCHECK(CalledOnValidThread()); DCHECK_NE(INVALID_SOCKET, socket_); DCHECK(!write_callback_); @@ -244,7 +244,7 @@ void UDPSocketWin::DoReadCallback(int rv) { DCHECK(read_callback_); // since Run may result in Read being called, clear read_callback_ up front. - CompletionCallback* c = read_callback_; + OldCompletionCallback* c = read_callback_; read_callback_ = NULL; c->Run(rv); } @@ -254,7 +254,7 @@ void UDPSocketWin::DoWriteCallback(int rv) { DCHECK(write_callback_); // since Run may result in Write being called, clear write_callback_ up front. - CompletionCallback* c = write_callback_; + OldCompletionCallback* c = write_callback_; write_callback_ = NULL; c->Run(rv); } |