diff --git a/lib/browser/api/browser-window.ts b/lib/browser/api/browser-window.ts index fe0c8f6ac0107..8a1bfe42fc3b2 100644 --- a/lib/browser/api/browser-window.ts +++ b/lib/browser/api/browser-window.ts @@ -28,9 +28,11 @@ Object.setPrototypeOf(BrowserWindow.prototype, BaseWindow.prototype); // Though this hack is only needed on macOS when the app is launched from // Finder, we still do it on all platforms in case of other bugs we don't // know. - this.webContents.once('load-url' as any, function (this: WebContents) { - this.focus(); - }); + if (this.webContents._initiallyShown) { + this.webContents.once('load-url' as any, function (this: WebContents) { + this.focus(); + }); + } // Redirect focus/blur event to app instance too. this.on('blur', (event: Event) => { diff --git a/shell/browser/api/electron_api_web_contents.cc b/shell/browser/api/electron_api_web_contents.cc index d387d8b9a8fa7..6c7d07bcb598a 100644 --- a/shell/browser/api/electron_api_web_contents.cc +++ b/shell/browser/api/electron_api_web_contents.cc @@ -474,8 +474,8 @@ WebContents::WebContents(v8::Isolate* isolate, // BrowserViews are not attached to a window initially so they should start // off as hidden. This is also important for compositor recycling. See: // https://github.com/electron/electron/pull/21372 - bool initially_shown = type_ != Type::BROWSER_VIEW; - options.Get(options::kShow, &initially_shown); + initially_shown_ = type_ != Type::BROWSER_VIEW; + options.Get(options::kShow, &initially_shown_); // Obtain the session. std::string partition; @@ -531,7 +531,7 @@ WebContents::WebContents(v8::Isolate* isolate, #endif } else { content::WebContents::CreateParams params(session->browser_context()); - params.initially_hidden = !initially_shown; + params.initially_hidden = !initially_shown_; web_contents = content::WebContents::Create(params); } @@ -2731,6 +2731,10 @@ v8::Local WebContents::Debugger(v8::Isolate* isolate) { return v8::Local::New(isolate, debugger_); } +bool WebContents::WasInitiallyShown() { + return initially_shown_; +} + void WebContents::GrantOriginAccess(const GURL& url) { content::ChildProcessSecurityPolicy::GetInstance()->GrantCommitOrigin( web_contents()->GetMainFrame()->GetProcess()->GetID(), @@ -2924,6 +2928,7 @@ v8::Local WebContents::FillObjectTemplate( .SetProperty("hostWebContents", &WebContents::HostWebContents) .SetProperty("devToolsWebContents", &WebContents::DevToolsWebContents) .SetProperty("debugger", &WebContents::Debugger) + .SetProperty("_initiallyShown", &WebContents::WasInitiallyShown) .Build(); } diff --git a/shell/browser/api/electron_api_web_contents.h b/shell/browser/api/electron_api_web_contents.h index f24b9a566fd0d..0dcfbb9b556b2 100644 --- a/shell/browser/api/electron_api_web_contents.h +++ b/shell/browser/api/electron_api_web_contents.h @@ -393,6 +393,7 @@ class WebContents : public gin::Wrappable, content::WebContents* HostWebContents() const; v8::Local DevToolsWebContents(v8::Isolate* isolate); v8::Local Debugger(v8::Isolate* isolate); + bool WasInitiallyShown(); WebContentsZoomController* GetZoomController() { return zoom_controller_; } @@ -683,6 +684,8 @@ class WebContents : public gin::Wrappable, // Observers of this WebContents. base::ObserverList observers_; + bool initially_shown_ = true; + // The ID of the process of the currently committed RenderViewHost. // -1 means no speculative RVH has been committed yet. int currently_committed_process_id_ = -1; diff --git a/typings/internal-electron.d.ts b/typings/internal-electron.d.ts index d7aae3092d57e..8fab594dc4b2c 100644 --- a/typings/internal-electron.d.ts +++ b/typings/internal-electron.d.ts @@ -56,6 +56,7 @@ declare namespace Electron { getLastWebPreferences(): Electron.WebPreferences; _getPreloadPaths(): string[]; equal(other: WebContents): boolean; + _initiallyShown: boolean; } interface WebPreferences {