| Index: net/socket/ssl_client_socket_nss.h
|
| ===================================================================
|
| --- net/socket/ssl_client_socket_nss.h (revision 113718)
|
| +++ net/socket/ssl_client_socket_nss.h (working copy)
|
| @@ -96,9 +96,6 @@
|
| virtual int Write(IOBuffer* buf,
|
| int buf_len,
|
| OldCompletionCallback* callback) OVERRIDE;
|
| - virtual int Write(IOBuffer* buf,
|
| - int buf_len,
|
| - const CompletionCallback& callback) OVERRIDE;
|
| virtual bool SetReceiveBufferSize(int32 size) OVERRIDE;
|
| virtual bool SetSendBufferSize(int32 size) OVERRIDE;
|
|
|
| @@ -236,8 +233,7 @@
|
| CompletionCallback user_connect_callback_;
|
| OldCompletionCallback* old_user_read_callback_;
|
| CompletionCallback user_read_callback_;
|
| - OldCompletionCallback* old_user_write_callback_;
|
| - CompletionCallback user_write_callback_;
|
| + OldCompletionCallback* user_write_callback_;
|
|
|
| // Used by Read function.
|
| scoped_refptr<IOBuffer> user_read_buf_;
|
|
|
| Property changes on: net/socket/ssl_client_socket_nss.h
|
| ___________________________________________________________________
|
| Deleted: svn:mergeinfo
|
|
|
|
|