diff options
| author | jhawkins@chromium.org <jhawkins@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2011-12-06 23:33:24 +0000 |
|---|---|---|
| committer | jhawkins@chromium.org <jhawkins@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2011-12-06 23:33:24 +0000 |
| commit | dbf036fcb743cfdcd5be421364c8b89b10ee3f55 (patch) | |
| tree | 034c3028c8b523d2bb6c2703416b26a81bc31663 /remoting/jingle_glue | |
| parent | ad24b1827fe58c4a22c0cddb5791a95f2ab1b21b (diff) | |
| download | chromium_src-dbf036fcb743cfdcd5be421364c8b89b10ee3f55.zip chromium_src-dbf036fcb743cfdcd5be421364c8b89b10ee3f55.tar.gz chromium_src-dbf036fcb743cfdcd5be421364c8b89b10ee3f55.tar.bz2 | |
base::Bind: Convert StreamSocket::Connect.
BUG=none
TEST=none
R=csilv
Review URL: http://codereview.chromium.org/8801004
git-svn-id: svn://svn.chromium.org/chrome/trunk/src@113283 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'remoting/jingle_glue')
| -rw-r--r-- | remoting/jingle_glue/ssl_socket_adapter.cc | 6 | ||||
| -rw-r--r-- | remoting/jingle_glue/ssl_socket_adapter.h | 4 |
2 files changed, 8 insertions, 2 deletions
diff --git a/remoting/jingle_glue/ssl_socket_adapter.cc b/remoting/jingle_glue/ssl_socket_adapter.cc index 625b8c1..1948c68 100644 --- a/remoting/jingle_glue/ssl_socket_adapter.cc +++ b/remoting/jingle_glue/ssl_socket_adapter.cc @@ -206,6 +206,12 @@ int TransportSocket::Connect(net::OldCompletionCallback* callback) { NOTREACHED(); return false; } +int TransportSocket::Connect(const net::CompletionCallback& callback) { + // Connect is never called by SSLClientSocket, instead SSLSocketAdapter + // calls Connect() on socket_ directly. + NOTREACHED(); + return false; +} void TransportSocket::Disconnect() { socket_->Close(); diff --git a/remoting/jingle_glue/ssl_socket_adapter.h b/remoting/jingle_glue/ssl_socket_adapter.h index 2e6ebeb..ffa593d 100644 --- a/remoting/jingle_glue/ssl_socket_adapter.h +++ b/remoting/jingle_glue/ssl_socket_adapter.h @@ -39,9 +39,9 @@ class TransportSocket : public net::StreamSocket, public sigslot::has_slots<> { addr_ = addr; } - // net::StreamSocket implementation - + // net::StreamSocket implementation. virtual int Connect(net::OldCompletionCallback* callback) OVERRIDE; + virtual int Connect(const net::CompletionCallback& callback) OVERRIDE; virtual void Disconnect() OVERRIDE; virtual bool IsConnected() const OVERRIDE; virtual bool IsConnectedAndIdle() const OVERRIDE; |