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

fix: emit will-navigate for links in chrome: pages (#40390)

Browse source 
* fix: emit will-navigate for links in chrome: pages

* test: will-navigate emitted from chrome: pages

* Update shell/browser/electron_navigation_throttle.cc

Co-authored-by: Charles Kerr <charles@charleskerr.com>

---------

Co-authored-by: Charles Kerr <charles@charleskerr.com>
This commit is contained in:
Samuel Maddock 2023-11-14 17:09:44 -05:00 • committed by GitHub
parent 0e4e9dc98c
commit 088affd4a4
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
2 changed files with 37 additions and 2 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

19
shell/browser/electron_navigation_throttle.cc
View file

@ -4,9 +4,11 @@
#include "shell/browser/electron_navigation_throttle.h"
#include "content/browser/renderer_host/render_frame_host_impl.h" // nogncheck
#include "content/public/browser/navigation_handle.h"
#include "shell/browser/api/electron_api_web_contents.h"
#include "shell/browser/javascript_environment.h"
#include "ui/base/page_transition_types.h"
namespace electron {
@ -37,11 +39,24 @@ ElectronNavigationThrottle::WillStartRequest() {
return PROCEED;
}
if (handle->IsRendererInitiated() &&
bool is_renderer_initiated = handle->IsRendererInitiated();
// Chrome's internal pages always mark navigation as browser-initiated. Let's
// ignore that.
// https://source.chromium.org/chromium/chromium/src/+/main:content/browser/renderer_host/navigator.cc;l=883-892;drc=0c8ffbe78dc0ef2047849e45cefb3f621043e956
if (!is_renderer_initiated &&
ui::PageTransitionIsWebTriggerable(handle->GetPageTransition())) {
auto* render_frame_host = contents->GetPrimaryMainFrame();
auto* rfh_impl =
static_cast<content::RenderFrameHostImpl*>(render_frame_host);
is_renderer_initiated = rfh_impl && rfh_impl->web_ui();
}
if (is_renderer_initiated &&
api_contents->EmitNavigationEvent("will-frame-navigate", handle)) {
return CANCEL;
}
if (handle->IsRendererInitiated() && handle->IsInMainFrame() &&
if (is_renderer_initiated && handle->IsInMainFrame() &&
api_contents->EmitNavigationEvent("will-navigate", handle)) {
return CANCEL;
}

20
spec/api-browser-window-spec.ts
View file

@ -584,6 +584,26 @@ describe('BrowserWindow module', () => {
expect(initiator).not.to.be.undefined();
expect(initiator).to.equal(subframe);
});
it('is triggered when navigating from chrome: to http:', async () => {
let hasEmittedWillNavigate = false;
const willNavigatePromise = new Promise((resolve) => {
w.webContents.once('will-navigate', e => {
e.preventDefault();
hasEmittedWillNavigate = true;
resolve(e.url);
});
});
await w.loadURL('chrome://gpu');
// shouldn't emit for browser-initiated request via loadURL
expect(hasEmittedWillNavigate).to.equal(false);
w.webContents.executeJavaScript(`location.href = ${JSON.stringify(url)}`);
const navigatedTo = await willNavigatePromise;
expect(navigatedTo).to.equal(url + '/');
expect(w.webContents.getURL()).to.equal('chrome://gpu/');
});
});
describe('will-frame-navigate event', () => {