From 120b6079a81b6b6f09527b5747c36a42a72f3810 Mon Sep 17 00:00:00 2001 From: Jeremy Apthorp Date: Tue, 2 Oct 2018 15:17:26 -0700 Subject: [PATCH] Move Net.HttpRequestCompletionErrorCodes to NetworkContext https://chromium-review.googlesource.com/c/chromium/src/+/1108083 --- atom/browser/net/atom_network_delegate.cc | 9 ++++++--- atom/browser/net/atom_network_delegate.h | 6 ++++-- 2 files changed, 10 insertions(+), 5 deletions(-) diff --git a/atom/browser/net/atom_network_delegate.cc b/atom/browser/net/atom_network_delegate.cc index 38c4181349e3..7f24e3810d73 100644 --- a/atom/browser/net/atom_network_delegate.cc +++ b/atom/browser/net/atom_network_delegate.cc @@ -343,14 +343,16 @@ void AtomNetworkDelegate::OnResponseStarted(net::URLRequest* request, request->was_cached()); } -void AtomNetworkDelegate::OnCompleted(net::URLRequest* request, bool started) { +void AtomNetworkDelegate::OnCompleted(net::URLRequest* request, + bool started, + int net_error) { // OnCompleted may happen before other events. callbacks_.erase(request->identifier()); if (request->status().status() == net::URLRequestStatus::FAILED || request->status().status() == net::URLRequestStatus::CANCELED) { // Error event. - OnErrorOccurred(request, started); + OnErrorOccurred(request, started, net_error); return; } @@ -452,7 +454,8 @@ bool AtomNetworkDelegate::OnCanUseReportingClient(const url::Origin& origin, } void AtomNetworkDelegate::OnErrorOccurred(net::URLRequest* request, - bool started) { + bool started, + int net_error) { if (!base::ContainsKey(simple_listeners_, kOnErrorOccurred)) return; diff --git a/atom/browser/net/atom_network_delegate.h b/atom/browser/net/atom_network_delegate.h index ed5645168fc8..35b4e86b48f7 100644 --- a/atom/browser/net/atom_network_delegate.h +++ b/atom/browser/net/atom_network_delegate.h @@ -106,7 +106,9 @@ class AtomNetworkDelegate : public net::NetworkDelegate { int64_t bytes_read) override {} void OnNetworkBytesSent(net::URLRequest* request, int64_t bytes_sent) override {} - void OnCompleted(net::URLRequest* request, bool started) override; + void OnCompleted(net::URLRequest* request, + bool started, + int net_error) override; void OnURLRequestDestroyed(net::URLRequest* request) override; void OnPACScriptError(int line_number, const base::string16& error) override { } @@ -141,7 +143,7 @@ class AtomNetworkDelegate : public net::NetworkDelegate { const GURL& endpoint) const override; private: - void OnErrorOccurred(net::URLRequest* request, bool started); + void OnErrorOccurred(net::URLRequest* request, bool started, int net_error); template void HandleSimpleEvent(SimpleEvent type,