mirrors/electron
2
0
Fork 0
Code Issues Pull requests Projects Releases Packages 1 Wiki Activity Actions 1

Move Net.HttpRequestCompletionErrorCodes to NetworkContext

Browse source 
1108083
This commit is contained in:
Jeremy Apthorp 2018-10-02 15:17:26 -07:00
parent 42120b4a72
commit 120b6079a8
2 changed files with 10 additions and 5 deletions
Download patch file Download diff file Expand all files Collapse all files

9
atom/browser/net/atom_network_delegate.cc
View file

@ -343,14 +343,16 @@ void AtomNetworkDelegate::OnResponseStarted(net::URLRequest* request,
request->was_cached()); 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. // OnCompleted may happen before other events.
callbacks_.erase(request->identifier()); callbacks_.erase(request->identifier());
if (request->status().status() == net::URLRequestStatus::FAILED || if (request->status().status() == net::URLRequestStatus::FAILED ||
request->status().status() == net::URLRequestStatus::CANCELED) { request->status().status() == net::URLRequestStatus::CANCELED) {
// Error event. // Error event.
OnErrorOccurred(request, started); OnErrorOccurred(request, started, net_error);
return; return;
} }
@ -452,7 +454,8 @@ bool AtomNetworkDelegate::OnCanUseReportingClient(const url::Origin& origin,
} }
void AtomNetworkDelegate::OnErrorOccurred(net::URLRequest* request, void AtomNetworkDelegate::OnErrorOccurred(net::URLRequest* request,
bool started) { bool started,
int net_error) {
if (!base::ContainsKey(simple_listeners_, kOnErrorOccurred)) if (!base::ContainsKey(simple_listeners_, kOnErrorOccurred))
return; return;

6
atom/browser/net/atom_network_delegate.h
View file

@ -106,7 +106,9 @@ class AtomNetworkDelegate : public net::NetworkDelegate {
int64_t bytes_read) override {} int64_t bytes_read) override {}
void OnNetworkBytesSent(net::URLRequest* request, void OnNetworkBytesSent(net::URLRequest* request,
int64_t bytes_sent) override {} 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 OnURLRequestDestroyed(net::URLRequest* request) override;
void OnPACScriptError(int line_number, const base::string16& error) 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; const GURL& endpoint) const override;
private: private:
void OnErrorOccurred(net::URLRequest* request, bool started); void OnErrorOccurred(net::URLRequest* request, bool started, int net_error);
template <typename... Args> template <typename... Args>
void HandleSimpleEvent(SimpleEvent type, void HandleSimpleEvent(SimpleEvent type,