| Index: jingle/notifier/base/proxy_resolving_client_socket.h
|
| ===================================================================
|
| --- jingle/notifier/base/proxy_resolving_client_socket.h (revision 113718)
|
| +++ jingle/notifier/base/proxy_resolving_client_socket.h (working copy)
|
| @@ -52,8 +52,6 @@
|
| const net::CompletionCallback& callback) OVERRIDE;
|
| virtual int Write(net::IOBuffer* buf, int buf_len,
|
| net::OldCompletionCallback* callback) OVERRIDE;
|
| - virtual int Write(net::IOBuffer* buf, int buf_len,
|
| - const net::CompletionCallback& callback) OVERRIDE;
|
| virtual bool SetReceiveBufferSize(int32 size) OVERRIDE;
|
| virtual bool SetSendBufferSize(int32 size) OVERRIDE;
|
| virtual int Connect(net::OldCompletionCallback* callback) OVERRIDE;
|
|
|
| Property changes on: jingle/notifier/base/proxy_resolving_client_socket.h
|
| ___________________________________________________________________
|
| Deleted: svn:mergeinfo
|
|
|
|
|