| Index: remoting/protocol/pepper_transport_socket_adapter.h
|
| diff --git a/remoting/protocol/pepper_transport_socket_adapter.h b/remoting/protocol/pepper_transport_socket_adapter.h
|
| index 881d61253b4981dbf4037c0f69be018ec9741cf4..c25506d468be4381850abc68f123583854a22746 100644
|
| --- a/remoting/protocol/pepper_transport_socket_adapter.h
|
| +++ b/remoting/protocol/pepper_transport_socket_adapter.h
|
| @@ -47,7 +47,7 @@ class PepperTransportSocketAdapter : public base::NonThreadSafe,
|
| // Adds candidate received from the peer.
|
| void AddRemoteCandidate(const std::string& candidate);
|
|
|
| - // net::Socket interface.
|
| + // net::Socket implementation.
|
| virtual int Read(net::IOBuffer* buf, int buf_len,
|
| net::OldCompletionCallback* callback) OVERRIDE;
|
| virtual int Write(net::IOBuffer* buf, int buf_len,
|
| @@ -55,8 +55,9 @@ class PepperTransportSocketAdapter : public base::NonThreadSafe,
|
| virtual bool SetReceiveBufferSize(int32 size) OVERRIDE;
|
| virtual bool SetSendBufferSize(int32 size) OVERRIDE;
|
|
|
| - // net::StreamSocket interface.
|
| + // 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;
|
| @@ -84,7 +85,8 @@ class PepperTransportSocketAdapter : public base::NonThreadSafe,
|
|
|
| scoped_ptr<pp::Transport_Dev> transport_;
|
|
|
| - net::OldCompletionCallback* connect_callback_;
|
| + net::OldCompletionCallback* old_connect_callback_;
|
| + net::CompletionCallback connect_callback_;
|
| bool connected_;
|
|
|
| bool get_address_pending_;
|
|
|