net/socket/socks_client_socket.h - Issue 12886034: Remove experimental code to pick the "warmest" socket

Side by Side Diff

Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.

Keyboard Shortcuts

	File
u :	up to issue
j / k :	jump to file after / before current file
J / K :	jump to next file with a comment after / before current file
	Side-by-side diff
i :	toggle intra-line diffs
e :	expand all comments
c :	collapse all comments
s :	toggle showing all comments
n / p :	next / previous diff chunk or comment
N / P :	next / previous comment
<Up> / <Down> :	next / previous line

	Issue
u :	up to list of issues
j / k :	jump to patch after / before current patch
o / <Enter> :	open current patch in side-by-side view
i :	open current patch in unified diff view

	Issue List
j / k :	jump to issue after / before current issue
o / <Enter> :	open current issue

Side by Side Diff: net/socket/socks_client_socket.h

Issue 12886034: Remove experimental code to pick the "warmest" socket (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src/

Patch Set: sync, fix conflict Created 7 years, 8 months ago

Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.

Jump to:

View unified diff | Download patch | Annotate | Revision Log

« no previous file with comments | « net/socket/socks5_client_socket.cc ('k') | net/socket/socks_client_socket.cc » ('j') | no next file with comments »

OLD	NEW
1 // Copyright (c) 2012 The Chromium Authors. All rights reserved.	1 // Copyright (c) 2012 The Chromium Authors. All rights reserved.

2 // Use of this source code is governed by a BSD-style license that can be	2 // Use of this source code is governed by a BSD-style license that can be

3 // found in the LICENSE file.	3 // found in the LICENSE file.

4	4

5 #ifndef NET_SOCKET_SOCKS_CLIENT_SOCKET_H_	5 #ifndef NET_SOCKET_SOCKS_CLIENT_SOCKET_H_

6 #define NET_SOCKET_SOCKS_CLIENT_SOCKET_H_	6 #define NET_SOCKET_SOCKS_CLIENT_SOCKET_H_

7	7

8 #include <string>	8 #include <string>

9	9

10 #include "base/basictypes.h"	10 #include "base/basictypes.h"

(...skipping 38 matching lines...) Expand 10 before \| Expand all \| Expand 10 after Loading...
49 // Does the SOCKS handshake and completes the protocol.	49 // Does the SOCKS handshake and completes the protocol.

50 virtual int Connect(const CompletionCallback& callback) OVERRIDE;	50 virtual int Connect(const CompletionCallback& callback) OVERRIDE;

51 virtual void Disconnect() OVERRIDE;	51 virtual void Disconnect() OVERRIDE;

52 virtual bool IsConnected() const OVERRIDE;	52 virtual bool IsConnected() const OVERRIDE;

53 virtual bool IsConnectedAndIdle() const OVERRIDE;	53 virtual bool IsConnectedAndIdle() const OVERRIDE;

54 virtual const BoundNetLog& NetLog() const OVERRIDE;	54 virtual const BoundNetLog& NetLog() const OVERRIDE;

55 virtual void SetSubresourceSpeculation() OVERRIDE;	55 virtual void SetSubresourceSpeculation() OVERRIDE;

56 virtual void SetOmniboxSpeculation() OVERRIDE;	56 virtual void SetOmniboxSpeculation() OVERRIDE;

57 virtual bool WasEverUsed() const OVERRIDE;	57 virtual bool WasEverUsed() const OVERRIDE;

58 virtual bool UsingTCPFastOpen() const OVERRIDE;	58 virtual bool UsingTCPFastOpen() const OVERRIDE;

59 virtual int64 NumBytesRead() const OVERRIDE;

60 virtual base::TimeDelta GetConnectTimeMicros() const OVERRIDE;

61 virtual bool WasNpnNegotiated() const OVERRIDE;	59 virtual bool WasNpnNegotiated() const OVERRIDE;

62 virtual NextProto GetNegotiatedProtocol() const OVERRIDE;	60 virtual NextProto GetNegotiatedProtocol() const OVERRIDE;

63 virtual bool GetSSLInfo(SSLInfo* ssl_info) OVERRIDE;	61 virtual bool GetSSLInfo(SSLInfo* ssl_info) OVERRIDE;

64	62

65 // Socket implementation.	63 // Socket implementation.

66 virtual int Read(IOBuffer* buf,	64 virtual int Read(IOBuffer* buf,

67 int buf_len,	65 int buf_len,

68 const CompletionCallback& callback) OVERRIDE;	66 const CompletionCallback& callback) OVERRIDE;

69 virtual int Write(IOBuffer* buf,	67 virtual int Write(IOBuffer* buf,

70 int buf_len,	68 int buf_len,

(...skipping 64 matching lines...) Expand 10 before \| Expand all \| Expand 10 after Loading...
135 HostResolver::RequestInfo host_request_info_;	133 HostResolver::RequestInfo host_request_info_;

136	134

137 BoundNetLog net_log_;	135 BoundNetLog net_log_;

138	136

139 DISALLOW_COPY_AND_ASSIGN(SOCKSClientSocket);	137 DISALLOW_COPY_AND_ASSIGN(SOCKSClientSocket);

140 };	138 };

141	139

142 } // namespace net	140 } // namespace net

143	141

144 #endif // NET_SOCKET_SOCKS_CLIENT_SOCKET_H_	142 #endif // NET_SOCKET_SOCKS_CLIENT_SOCKET_H_

OLD	NEW