From ac8d05af898765571f7f7db4b8bfc8b73907652d Mon Sep 17 00:00:00 2001 From: Daniel Baumann Date: Wed, 26 Jun 2024 08:17:15 +0200 Subject: Merging upstream version 127.0.2. Signed-off-by: Daniel Baumann --- browser/components/BrowserContentHandler.sys.mjs | 8 +++++++- browser/components/BrowserGlue.sys.mjs | 4 ++++ 2 files changed, 11 insertions(+), 1 deletion(-) (limited to 'browser/components') diff --git a/browser/components/BrowserContentHandler.sys.mjs b/browser/components/BrowserContentHandler.sys.mjs index 6c156d1700..1ac7a09d2d 100644 --- a/browser/components/BrowserContentHandler.sys.mjs +++ b/browser/components/BrowserContentHandler.sys.mjs @@ -322,7 +322,13 @@ function openBrowserWindow( Ci.nsILoadContext ).usePrivateBrowsing = true; - if (AppConstants.platform == "win") { + if ( + AppConstants.platform == "win" && + Services.prefs.getBoolPref( + "browser.privateWindowSeparation.enabled", + true + ) + ) { lazy.WinTaskbar.setGroupIdForWindow( win, lazy.WinTaskbar.defaultPrivateGroupId diff --git a/browser/components/BrowserGlue.sys.mjs b/browser/components/BrowserGlue.sys.mjs index 81889db040..2f2aa0ac49 100644 --- a/browser/components/BrowserGlue.sys.mjs +++ b/browser/components/BrowserGlue.sys.mjs @@ -2743,6 +2743,10 @@ BrowserGlue.prototype = { name: "ensurePrivateBrowsingShortcutExists", condition: AppConstants.platform == "win" && + Services.prefs.getBoolPref( + "browser.privateWindowSeparation.enabled", + true + ) && // We don't want a shortcut if it's been disabled, eg: by enterprise policy. lazy.PrivateBrowsingUtils.enabled && // Private Browsing shortcuts for packaged builds come with the package, -- cgit v1.2.3