OLD | NEW |
1 // Copyright (c) 2011 The Chromium Authors. All rights reserved. | 1 // Copyright (c) 2011 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 // This StreamSocket implementation wraps a ClientSocketHandle that is created | 5 // This StreamSocket implementation wraps a ClientSocketHandle that is created |
6 // from the client socket pool after resolving proxies. | 6 // from the client socket pool after resolving proxies. |
7 | 7 |
8 #ifndef JINGLE_NOTIFIER_BASE_PROXY_RESOLVING_CLIENT_SOCKET_H_ | 8 #ifndef JINGLE_NOTIFIER_BASE_PROXY_RESOLVING_CLIENT_SOCKET_H_ |
9 #define JINGLE_NOTIFIER_BASE_PROXY_RESOLVING_CLIENT_SOCKET_H_ | 9 #define JINGLE_NOTIFIER_BASE_PROXY_RESOLVING_CLIENT_SOCKET_H_ |
10 #pragma once | 10 #pragma once |
(...skipping 35 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
46 virtual ~ProxyResolvingClientSocket(); | 46 virtual ~ProxyResolvingClientSocket(); |
47 | 47 |
48 // net::StreamSocket implementation. | 48 // net::StreamSocket implementation. |
49 virtual int Read(net::IOBuffer* buf, int buf_len, | 49 virtual int Read(net::IOBuffer* buf, int buf_len, |
50 net::OldCompletionCallback* callback) OVERRIDE; | 50 net::OldCompletionCallback* callback) OVERRIDE; |
51 virtual int Write(net::IOBuffer* buf, int buf_len, | 51 virtual int Write(net::IOBuffer* buf, int buf_len, |
52 net::OldCompletionCallback* callback) OVERRIDE; | 52 net::OldCompletionCallback* callback) OVERRIDE; |
53 virtual bool SetReceiveBufferSize(int32 size) OVERRIDE; | 53 virtual bool SetReceiveBufferSize(int32 size) OVERRIDE; |
54 virtual bool SetSendBufferSize(int32 size) OVERRIDE; | 54 virtual bool SetSendBufferSize(int32 size) OVERRIDE; |
55 virtual int Connect(net::OldCompletionCallback* callback) OVERRIDE; | 55 virtual int Connect(net::OldCompletionCallback* callback) OVERRIDE; |
| 56 virtual int Connect(const net::CompletionCallback& callback) OVERRIDE; |
56 virtual void Disconnect() OVERRIDE; | 57 virtual void Disconnect() OVERRIDE; |
57 virtual bool IsConnected() const OVERRIDE; | 58 virtual bool IsConnected() const OVERRIDE; |
58 virtual bool IsConnectedAndIdle() const OVERRIDE; | 59 virtual bool IsConnectedAndIdle() const OVERRIDE; |
59 virtual int GetPeerAddress(net::AddressList* address) const OVERRIDE; | 60 virtual int GetPeerAddress(net::AddressList* address) const OVERRIDE; |
60 virtual int GetLocalAddress(net::IPEndPoint* address) const OVERRIDE; | 61 virtual int GetLocalAddress(net::IPEndPoint* address) const OVERRIDE; |
61 virtual const net::BoundNetLog& NetLog() const OVERRIDE; | 62 virtual const net::BoundNetLog& NetLog() const OVERRIDE; |
62 virtual void SetSubresourceSpeculation() OVERRIDE; | 63 virtual void SetSubresourceSpeculation() OVERRIDE; |
63 virtual void SetOmniboxSpeculation() OVERRIDE; | 64 virtual void SetOmniboxSpeculation() OVERRIDE; |
64 virtual bool WasEverUsed() const OVERRIDE; | 65 virtual bool WasEverUsed() const OVERRIDE; |
65 virtual bool UsingTCPFastOpen() const OVERRIDE; | 66 virtual bool UsingTCPFastOpen() const OVERRIDE; |
(...skipping 22 matching lines...) Expand all Loading... |
88 | 89 |
89 const net::SSLConfig ssl_config_; | 90 const net::SSLConfig ssl_config_; |
90 net::ProxyService::PacRequest* pac_request_; | 91 net::ProxyService::PacRequest* pac_request_; |
91 net::ProxyInfo proxy_info_; | 92 net::ProxyInfo proxy_info_; |
92 net::HostPortPair dest_host_port_pair_; | 93 net::HostPortPair dest_host_port_pair_; |
93 bool tried_direct_connect_fallback_; | 94 bool tried_direct_connect_fallback_; |
94 net::BoundNetLog bound_net_log_; | 95 net::BoundNetLog bound_net_log_; |
95 base::WeakPtrFactory<ProxyResolvingClientSocket> weak_factory_; | 96 base::WeakPtrFactory<ProxyResolvingClientSocket> weak_factory_; |
96 | 97 |
97 // The callback passed to Connect(). | 98 // The callback passed to Connect(). |
98 net::OldCompletionCallback* user_connect_callback_; | 99 net::OldCompletionCallback* old_user_connect_callback_; |
| 100 net::CompletionCallback user_connect_callback_; |
99 }; | 101 }; |
100 | 102 |
101 } // namespace notifier | 103 } // namespace notifier |
102 | 104 |
103 #endif // JINGLE_NOTIFIER_BASE_PROXY_RESOLVING_CLIENT_SOCKET_H_ | 105 #endif // JINGLE_NOTIFIER_BASE_PROXY_RESOLVING_CLIENT_SOCKET_H_ |
OLD | NEW |