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

Side by Side Diff: net/http/http_network_transaction.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_NETWORK_TRANSACTION_H_ 5 #ifndef NET_HTTP_HTTP_NETWORK_TRANSACTION_H_
6 #define NET_HTTP_HTTP_NETWORK_TRANSACTION_H_ 6 #define NET_HTTP_HTTP_NETWORK_TRANSACTION_H_
7 7
8 #include <stdint.h> 8 #include <stdint.h>
9 9
10 #include <memory> 10 #include <memory>
(...skipping 41 matching lines...) Expand 10 before | Expand all | Expand 10 after
52 public HttpStreamRequest::Delegate { 52 public HttpStreamRequest::Delegate {
53 public: 53 public:
54 HttpNetworkTransaction(RequestPriority priority, 54 HttpNetworkTransaction(RequestPriority priority,
55 HttpNetworkSession* session); 55 HttpNetworkSession* session);
56 56
57 ~HttpNetworkTransaction() override; 57 ~HttpNetworkTransaction() override;
58 58
59 // HttpTransaction methods: 59 // HttpTransaction methods:
60 int Start(const HttpRequestInfo* request_info, 60 int Start(const HttpRequestInfo* request_info,
61 const CompletionCallback& callback, 61 const CompletionCallback& callback,
62 const BoundNetLog& net_log) override; 62 const NetLogWithSource& net_log) override;
63 int RestartIgnoringLastError(const CompletionCallback& callback) override; 63 int RestartIgnoringLastError(const CompletionCallback& callback) override;
64 int RestartWithCertificate(X509Certificate* client_cert, 64 int RestartWithCertificate(X509Certificate* client_cert,
65 SSLPrivateKey* client_private_key, 65 SSLPrivateKey* client_private_key,
66 const CompletionCallback& callback) override; 66 const CompletionCallback& callback) override;
67 int RestartWithAuth(const AuthCredentials& credentials, 67 int RestartWithAuth(const AuthCredentials& credentials,
68 const CompletionCallback& callback) override; 68 const CompletionCallback& callback) override;
69 bool IsReadyToRestartForAuth() override; 69 bool IsReadyToRestartForAuth() override;
70 70
71 int Read(IOBuffer* buf, 71 int Read(IOBuffer* buf,
72 int buf_len, 72 int buf_len,
(...skipping 230 matching lines...) Expand 10 before | Expand all | Expand 10 after
303 // Whether this transaction is waiting for proxy auth, server auth, or is 303 // Whether this transaction is waiting for proxy auth, server auth, or is
304 // not waiting for any auth at all. |pending_auth_target_| is read and 304 // not waiting for any auth at all. |pending_auth_target_| is read and
305 // cleared by RestartWithAuth(). 305 // cleared by RestartWithAuth().
306 HttpAuth::Target pending_auth_target_; 306 HttpAuth::Target pending_auth_target_;
307 307
308 CompletionCallback io_callback_; 308 CompletionCallback io_callback_;
309 CompletionCallback callback_; 309 CompletionCallback callback_;
310 310
311 HttpNetworkSession* session_; 311 HttpNetworkSession* session_;
312 312
313 BoundNetLog net_log_; 313 NetLogWithSource net_log_;
314 const HttpRequestInfo* request_; 314 const HttpRequestInfo* request_;
315 RequestPriority priority_; 315 RequestPriority priority_;
316 HttpResponseInfo response_; 316 HttpResponseInfo response_;
317 317
318 // |proxy_info_| is the ProxyInfo used by the HttpStreamRequest. 318 // |proxy_info_| is the ProxyInfo used by the HttpStreamRequest.
319 ProxyInfo proxy_info_; 319 ProxyInfo proxy_info_;
320 320
321 std::unique_ptr<HttpStreamRequest> stream_request_; 321 std::unique_ptr<HttpStreamRequest> stream_request_;
322 std::unique_ptr<HttpStream> stream_; 322 std::unique_ptr<HttpStream> stream_;
323 323
(...skipping 52 matching lines...) Expand 10 before | Expand all | Expand 10 after
376 ConnectionAttempts connection_attempts_; 376 ConnectionAttempts connection_attempts_;
377 IPEndPoint remote_endpoint_; 377 IPEndPoint remote_endpoint_;
378 // Network error details for this transaction. 378 // Network error details for this transaction.
379 NetErrorDetails net_error_details_; 379 NetErrorDetails net_error_details_;
380 DISALLOW_COPY_AND_ASSIGN(HttpNetworkTransaction); 380 DISALLOW_COPY_AND_ASSIGN(HttpNetworkTransaction);
381 }; 381 };
382 382
383 } // namespace net 383 } // namespace net
384 384
385 #endif // NET_HTTP_HTTP_NETWORK_TRANSACTION_H_ 385 #endif // NET_HTTP_HTTP_NETWORK_TRANSACTION_H_
OLDNEW

Powered by Google App Engine
This is Rietveld 408576698