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

refactor: wire will-navigate up to a navigation throttle instead of OpenURL (#25065)

Browse source 
* refactor: wire will-navigate up to a navigation throttle instead of OpenURL

* spec: add test for x-site _top navigation
This commit is contained in:
Samuel Attard 2020-08-21 12:34:09 -07:00 • committed by GitHub
parent a17e97c3b2
commit b1e2185c5e
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
4 changed files with 65 additions and 6 deletions
Download patch file Download diff file Expand all files Collapse all files

5
shell/browser/api/electron_api_web_contents.cc
View file

@ -769,12 +769,7 @@ content::WebContents* WebContents::OpenURLFromTab(
params.post_data);
return nullptr;
}
if (!weak_this)
return nullptr;
// Give user a chance to cancel navigation.
if (Emit("will-navigate", params.url))
return nullptr;
if (!weak_this)
return nullptr;

24
shell/browser/electron_navigation_throttle.cc
View file

@ -20,6 +20,30 @@ const char* ElectronNavigationThrottle::GetNameForLogging() {
return "ElectronNavigationThrottle";
}
content::NavigationThrottle::ThrottleCheckResult
ElectronNavigationThrottle::WillStartRequest() {
auto* handle = navigation_handle();
auto* contents = handle->GetWebContents();
if (!contents) {
NOTREACHED();
return PROCEED;
}
v8::Isolate* isolate = JavascriptEnvironment::GetIsolate();
v8::HandleScope scope(isolate);
api::WebContents* api_contents = api::WebContents::From(contents);
if (!api_contents) {
// No need to emit any event if the WebContents is not available in JS.
return PROCEED;
}
if (handle->IsRendererInitiated() && handle->IsInMainFrame() &&
api_contents->EmitNavigationEvent("will-navigate", handle)) {
return CANCEL;
}
return PROCEED;
}
content::NavigationThrottle::ThrottleCheckResult
ElectronNavigationThrottle::WillRedirectRequest() {
auto* handle = navigation_handle();

2
shell/browser/electron_navigation_throttle.h
View file

@ -14,6 +14,8 @@ class ElectronNavigationThrottle : public content::NavigationThrottle {
explicit ElectronNavigationThrottle(content::NavigationHandle* handle);
~ElectronNavigationThrottle() override;
ElectronNavigationThrottle::ThrottleCheckResult WillStartRequest() override;
ElectronNavigationThrottle::ThrottleCheckResult WillRedirectRequest()
override;