summaryrefslogtreecommitdiffstats
path: root/net/socket/tcp_client_socket_win.cc
diff options
context:
space:
mode:
authorwillchan@chromium.org <willchan@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98>2011-10-01 20:38:10 +0000
committerwillchan@chromium.org <willchan@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98>2011-10-01 20:38:10 +0000
commitf1f3f0f8af3740ec2afaebcaed410950a9cc0ac8 (patch)
tree6ccdd87ccfc89adbcb372c517559fa61fbc6c6b2 /net/socket/tcp_client_socket_win.cc
parentd1666539b57bf8552e203d355fd09909d36f9732 (diff)
downloadchromium_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/tcp_client_socket_win.cc')
-rw-r--r--net/socket/tcp_client_socket_win.cc10
1 files changed, 5 insertions, 5 deletions
diff --git a/net/socket/tcp_client_socket_win.cc b/net/socket/tcp_client_socket_win.cc
index 8b192f4..1e69dd9 100644
--- a/net/socket/tcp_client_socket_win.cc
+++ b/net/socket/tcp_client_socket_win.cc
@@ -382,7 +382,7 @@ int TCPClientSocketWin::Bind(const IPEndPoint& address) {
}
-int TCPClientSocketWin::Connect(CompletionCallback* callback) {
+int TCPClientSocketWin::Connect(OldCompletionCallback* callback) {
DCHECK(CalledOnValidThread());
// If already connected, then just return OK.
@@ -670,7 +670,7 @@ base::TimeDelta TCPClientSocketWin::GetConnectTimeMicros() const {
int TCPClientSocketWin::Read(IOBuffer* buf,
int buf_len,
- CompletionCallback* callback) {
+ OldCompletionCallback* callback) {
DCHECK(CalledOnValidThread());
DCHECK_NE(socket_, INVALID_SOCKET);
DCHECK(!waiting_read_);
@@ -712,7 +712,7 @@ int TCPClientSocketWin::Read(IOBuffer* buf,
int TCPClientSocketWin::Write(IOBuffer* buf,
int buf_len,
- CompletionCallback* callback) {
+ OldCompletionCallback* callback) {
DCHECK(CalledOnValidThread());
DCHECK_NE(socket_, INVALID_SOCKET);
DCHECK(!waiting_write_);
@@ -808,7 +808,7 @@ void TCPClientSocketWin::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);
}
@@ -818,7 +818,7 @@ void TCPClientSocketWin::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);
}