Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(71)

Side by Side Diff: jingle/glue/proxy_resolving_client_socket.h

Issue 2351513002: net: rename BoundNetLog to NetLogWithSource (Closed)
Patch Set: one more fix, content bound_net_log_ Created 4 years, 2 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
OLDNEW
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 // 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_GLUE_PROXY_RESOLVING_CLIENT_SOCKET_H_ 8 #ifndef JINGLE_GLUE_PROXY_RESOLVING_CLIENT_SOCKET_H_
9 #define JINGLE_GLUE_PROXY_RESOLVING_CLIENT_SOCKET_H_ 9 #define JINGLE_GLUE_PROXY_RESOLVING_CLIENT_SOCKET_H_
10 10
(...skipping 49 matching lines...) Expand 10 before | Expand all | Expand 10 after
60 int buf_len, 60 int buf_len,
61 const net::CompletionCallback& callback) override; 61 const net::CompletionCallback& callback) override;
62 int SetReceiveBufferSize(int32_t size) override; 62 int SetReceiveBufferSize(int32_t size) override;
63 int SetSendBufferSize(int32_t size) override; 63 int SetSendBufferSize(int32_t size) override;
64 int Connect(const net::CompletionCallback& callback) override; 64 int Connect(const net::CompletionCallback& callback) override;
65 void Disconnect() override; 65 void Disconnect() override;
66 bool IsConnected() const override; 66 bool IsConnected() const override;
67 bool IsConnectedAndIdle() const override; 67 bool IsConnectedAndIdle() const override;
68 int GetPeerAddress(net::IPEndPoint* address) const override; 68 int GetPeerAddress(net::IPEndPoint* address) const override;
69 int GetLocalAddress(net::IPEndPoint* address) const override; 69 int GetLocalAddress(net::IPEndPoint* address) const override;
70 const net::BoundNetLog& NetLog() const override; 70 const net::NetLogWithSource& NetLog() const override;
71 void SetSubresourceSpeculation() override; 71 void SetSubresourceSpeculation() override;
72 void SetOmniboxSpeculation() override; 72 void SetOmniboxSpeculation() override;
73 bool WasEverUsed() const override; 73 bool WasEverUsed() const override;
74 bool WasNpnNegotiated() const override; 74 bool WasNpnNegotiated() const override;
75 net::NextProto GetNegotiatedProtocol() const override; 75 net::NextProto GetNegotiatedProtocol() const override;
76 bool GetSSLInfo(net::SSLInfo* ssl_info) override; 76 bool GetSSLInfo(net::SSLInfo* ssl_info) override;
77 void GetConnectionAttempts(net::ConnectionAttempts* out) const override; 77 void GetConnectionAttempts(net::ConnectionAttempts* out) const override;
78 void ClearConnectionAttempts() override {} 78 void ClearConnectionAttempts() override {}
79 void AddConnectionAttempts(const net::ConnectionAttempts& attempts) override { 79 void AddConnectionAttempts(const net::ConnectionAttempts& attempts) override {
80 } 80 }
(...skipping 17 matching lines...) Expand all
98 98
99 // The transport socket. 99 // The transport socket.
100 std::unique_ptr<net::ClientSocketHandle> transport_; 100 std::unique_ptr<net::ClientSocketHandle> transport_;
101 101
102 const net::SSLConfig ssl_config_; 102 const net::SSLConfig ssl_config_;
103 net::ProxyService::PacRequest* pac_request_; 103 net::ProxyService::PacRequest* pac_request_;
104 net::ProxyInfo proxy_info_; 104 net::ProxyInfo proxy_info_;
105 const net::HostPortPair dest_host_port_pair_; 105 const net::HostPortPair dest_host_port_pair_;
106 const GURL proxy_url_; 106 const GURL proxy_url_;
107 bool tried_direct_connect_fallback_; 107 bool tried_direct_connect_fallback_;
108 net::BoundNetLog bound_net_log_; 108 net::NetLogWithSource net_log_;
109 109
110 // The callback passed to Connect(). 110 // The callback passed to Connect().
111 net::CompletionCallback user_connect_callback_; 111 net::CompletionCallback user_connect_callback_;
112 112
113 base::WeakPtrFactory<ProxyResolvingClientSocket> weak_factory_; 113 base::WeakPtrFactory<ProxyResolvingClientSocket> weak_factory_;
114 114
115 DISALLOW_COPY_AND_ASSIGN(ProxyResolvingClientSocket); 115 DISALLOW_COPY_AND_ASSIGN(ProxyResolvingClientSocket);
116 }; 116 };
117 117
118 } // namespace jingle_glue 118 } // namespace jingle_glue
119 119
120 #endif // JINGLE_GLUE_PROXY_RESOLVING_CLIENT_SOCKET_H_ 120 #endif // JINGLE_GLUE_PROXY_RESOLVING_CLIENT_SOCKET_H_
OLDNEW

Powered by Google App Engine
This is Rietveld 408576698