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

feat: migrate webRequest module to NetworkService (Part 7) (#19820)

Browse source 
* fix: gin treats Function as Dictionary when doing convertions

* fix: check if listener exists

* fix: listener callback should be executed in next tick

* feat: make InProgressRequest work

* test: re-enable protocol test that relies on webRequest

* chore: merge conditions
This commit is contained in:
Cheng Zhao 2019-08-20 20:46:20 +09:00 • committed by GitHub
parent 1dc02e6dbc
commit cd1b15a155
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
5 changed files with 38 additions and 14 deletions
Download patch file Download diff file Expand all files Collapse all files

15
shell/browser/net/proxying_url_loader_factory.cc
View file

@ -697,14 +697,13 @@ void ProxyingURLLoaderFactory::CreateLoaderAndStart(
return;
}
// Pass-through to the original factory.
target_factory_->CreateLoaderAndStart(std::move(loader), routing_id,
request_id, options, request,
std::move(client), traffic_annotation);
// TODO(zcbenz): Remove the |CreateLoaderAndStart| call and create
// InProgressRequest when the webRequest API is used.
return;
if (!web_request_api()->HasListener()) {
// Pass-through to the original factory.
target_factory_->CreateLoaderAndStart(
std::move(loader), routing_id, request_id, options, request,
std::move(client), traffic_annotation);
return;
}
// The request ID doesn't really matter. It just needs to be unique
// per-BrowserContext so extensions can make sense of it. Note that

1
shell/browser/net/proxying_url_loader_factory.h
View file

@ -31,6 +31,7 @@ class WebRequestAPI {
const std::set<std::string>& set_headers,
int error_code)>;
virtual bool HasListener() const = 0;
virtual int OnBeforeRequest(extensions::WebRequestInfo* info,
const network::ResourceRequest& request,
net::CompletionOnceCallback callback,