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

Side by Side Diff: chrome/browser/devtools/devtools_network_transaction.cc

Issue 1006643002: Plumb connection attempts from (non-proxy) ConnectJobs to HttpNetworkTransaction. (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: rebase, resolve conflict Created 5 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
OLDNEW
1 // Copyright 2014 The Chromium Authors. All rights reserved. 1 // Copyright 2014 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 #include "chrome/browser/devtools/devtools_network_transaction.h" 5 #include "chrome/browser/devtools/devtools_network_transaction.h"
6 6
7 #include "chrome/browser/devtools/devtools_network_controller.h" 7 #include "chrome/browser/devtools/devtools_network_controller.h"
8 #include "chrome/browser/devtools/devtools_network_interceptor.h" 8 #include "chrome/browser/devtools/devtools_network_interceptor.h"
9 #include "net/base/net_errors.h" 9 #include "net/base/net_errors.h"
10 #include "net/base/upload_progress.h" 10 #include "net/base/upload_progress.h"
11 #include "net/http/http_network_transaction.h" 11 #include "net/http/http_network_transaction.h"
12 #include "net/http/http_request_info.h" 12 #include "net/http/http_request_info.h"
13 #include "net/socket/connection_attempts.h"
13 14
14 // Keep in sync with kDevToolsRequestInitiator and 15 // Keep in sync with kDevToolsRequestInitiator and
15 // kDevToolsEmulateNetworkConditionsClientId defined in 16 // kDevToolsEmulateNetworkConditionsClientId defined in
16 // InspectorResourceAgent.cpp. 17 // InspectorResourceAgent.cpp.
17 const char DevToolsNetworkTransaction::kDevToolsRequestInitiator[] = 18 const char DevToolsNetworkTransaction::kDevToolsRequestInitiator[] =
18 "X-DevTools-Request-Initiator"; 19 "X-DevTools-Request-Initiator";
19 const char 20 const char
20 DevToolsNetworkTransaction::kDevToolsEmulateNetworkConditionsClientId[] = 21 DevToolsNetworkTransaction::kDevToolsEmulateNetworkConditionsClientId[] =
21 "X-DevTools-Emulate-Network-Conditions-Client-Id"; 22 "X-DevTools-Emulate-Network-Conditions-Client-Id";
22 23
(...skipping 236 matching lines...) Expand 10 before | Expand all | Expand 10 after
259 const BeforeProxyHeadersSentCallback& callback) { 260 const BeforeProxyHeadersSentCallback& callback) {
260 network_transaction_->SetBeforeProxyHeadersSentCallback(callback); 261 network_transaction_->SetBeforeProxyHeadersSentCallback(callback);
261 } 262 }
262 263
263 int DevToolsNetworkTransaction::ResumeNetworkStart() { 264 int DevToolsNetworkTransaction::ResumeNetworkStart() {
264 if (failed_) 265 if (failed_)
265 return net::ERR_INTERNET_DISCONNECTED; 266 return net::ERR_INTERNET_DISCONNECTED;
266 return network_transaction_->ResumeNetworkStart(); 267 return network_transaction_->ResumeNetworkStart();
267 } 268 }
268 269
270 void
271 DevToolsNetworkTransaction::GetConnectionAttempts(net::ConnectionAttempts* out)
272 const {
273 network_transaction_->GetConnectionAttempts(out);
274 }
275
269 void DevToolsNetworkTransaction::FireThrottledCallback() { 276 void DevToolsNetworkTransaction::FireThrottledCallback() {
270 DCHECK(!callback_.is_null()); 277 DCHECK(!callback_.is_null());
271 DCHECK(callback_type_ == READ || callback_type_ == START); 278 DCHECK(callback_type_ == READ || callback_type_ == START);
272 net::CompletionCallback callback = callback_; 279 net::CompletionCallback callback = callback_;
273 callback_.Reset(); 280 callback_.Reset();
274 callback_type_ = NONE; 281 callback_type_ = NONE;
275 callback.Run(throttled_result_); 282 callback.Run(throttled_result_);
276 } 283 }
OLDNEW
« no previous file with comments | « chrome/browser/devtools/devtools_network_transaction.h ('k') | net/http/failing_http_transaction_factory.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698