| Index: net/socket/tcp_socket_win.h
|
| diff --git a/net/socket/tcp_socket_win.h b/net/socket/tcp_socket_win.h
|
| index 2ddd538f211ff5ddcd8e0fe0e6d3f00cb36bcaca..8f6ab10459d736cdee38b8d3e21a795315bcb0de 100644
|
| --- a/net/socket/tcp_socket_win.h
|
| +++ b/net/socket/tcp_socket_win.h
|
| @@ -25,7 +25,7 @@ class IOBuffer;
|
| class IPEndPoint;
|
|
|
| class NET_EXPORT TCPSocketWin : NON_EXPORTED_BASE(public base::NonThreadSafe),
|
| - public base::win::ObjectWatcher::Delegate {
|
| + public base::win::ObjectWatcher::Delegate {
|
| public:
|
| TCPSocketWin(NetLog* net_log, const NetLog::Source& source);
|
| virtual ~TCPSocketWin();
|
| @@ -99,8 +99,7 @@ class NET_EXPORT TCPSocketWin : NON_EXPORTED_BASE(public base::NonThreadSafe),
|
| // base::ObjectWatcher::Delegate implementation.
|
| virtual void OnObjectSignaled(HANDLE object) OVERRIDE;
|
|
|
| - int AcceptInternal(scoped_ptr<TCPSocketWin>* socket,
|
| - IPEndPoint* address);
|
| + int AcceptInternal(scoped_ptr<TCPSocketWin>* socket, IPEndPoint* address);
|
|
|
| int DoConnect();
|
| void DoConnectComplete(int result);
|
| @@ -152,4 +151,3 @@ class NET_EXPORT TCPSocketWin : NON_EXPORTED_BASE(public base::NonThreadSafe),
|
| } // namespace net
|
|
|
| #endif // NET_SOCKET_TCP_SOCKET_WIN_H_
|
| -
|
|
|