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

Side by Side Diff: net/http/http_proxy_client_socket.h

Issue 2351513002: net: rename BoundNetLog to NetLogWithSource (Closed)
Patch Set: one more fix, content bound_net_log_ Created 4 years, 3 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 #ifndef NET_HTTP_HTTP_PROXY_CLIENT_SOCKET_H_ 5 #ifndef NET_HTTP_HTTP_PROXY_CLIENT_SOCKET_H_
6 #define NET_HTTP_HTTP_PROXY_CLIENT_SOCKET_H_ 6 #define NET_HTTP_HTTP_PROXY_CLIENT_SOCKET_H_
7 7
8 #include <stdint.h> 8 #include <stdint.h>
9 9
10 #include <string> 10 #include <string>
(...skipping 47 matching lines...) Expand 10 before | Expand all | Expand 10 after
58 int RestartWithAuth(const CompletionCallback& callback) override; 58 int RestartWithAuth(const CompletionCallback& callback) override;
59 const scoped_refptr<HttpAuthController>& GetAuthController() const override; 59 const scoped_refptr<HttpAuthController>& GetAuthController() const override;
60 bool IsUsingSpdy() const override; 60 bool IsUsingSpdy() const override;
61 NextProto GetProxyNegotiatedProtocol() const override; 61 NextProto GetProxyNegotiatedProtocol() const override;
62 62
63 // StreamSocket implementation. 63 // StreamSocket implementation.
64 int Connect(const CompletionCallback& callback) override; 64 int Connect(const 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 const BoundNetLog& NetLog() const override; 68 const NetLogWithSource& NetLog() const override;
69 void SetSubresourceSpeculation() override; 69 void SetSubresourceSpeculation() override;
70 void SetOmniboxSpeculation() override; 70 void SetOmniboxSpeculation() override;
71 bool WasEverUsed() const override; 71 bool WasEverUsed() const override;
72 bool WasNpnNegotiated() const override; 72 bool WasNpnNegotiated() const override;
73 NextProto GetNegotiatedProtocol() const override; 73 NextProto GetNegotiatedProtocol() const override;
74 bool GetSSLInfo(SSLInfo* ssl_info) override; 74 bool GetSSLInfo(SSLInfo* ssl_info) override;
75 void GetConnectionAttempts(ConnectionAttempts* out) const override; 75 void GetConnectionAttempts(ConnectionAttempts* out) const override;
76 void ClearConnectionAttempts() override {} 76 void ClearConnectionAttempts() override {}
77 void AddConnectionAttempts(const ConnectionAttempts& attempts) override {} 77 void AddConnectionAttempts(const ConnectionAttempts& attempts) override {}
78 int64_t GetTotalReceivedBytes() const override; 78 int64_t GetTotalReceivedBytes() const override;
(...skipping 80 matching lines...) Expand 10 before | Expand all | Expand 10 after
159 159
160 // Used only for redirects. 160 // Used only for redirects.
161 bool redirect_has_load_timing_info_; 161 bool redirect_has_load_timing_info_;
162 LoadTimingInfo redirect_load_timing_info_; 162 LoadTimingInfo redirect_load_timing_info_;
163 163
164 const HostPortPair proxy_server_; 164 const HostPortPair proxy_server_;
165 165
166 // This delegate must outlive this proxy client socket. 166 // This delegate must outlive this proxy client socket.
167 ProxyDelegate* proxy_delegate_; 167 ProxyDelegate* proxy_delegate_;
168 168
169 const BoundNetLog net_log_; 169 const NetLogWithSource net_log_;
170 170
171 DISALLOW_COPY_AND_ASSIGN(HttpProxyClientSocket); 171 DISALLOW_COPY_AND_ASSIGN(HttpProxyClientSocket);
172 }; 172 };
173 173
174 } // namespace net 174 } // namespace net
175 175
176 #endif // NET_HTTP_HTTP_PROXY_CLIENT_SOCKET_H_ 176 #endif // NET_HTTP_HTTP_PROXY_CLIENT_SOCKET_H_
OLDNEW

Powered by Google App Engine
This is Rietveld 408576698