diff options
| author | Daniel Baumann <daniel.baumann@progress-linux.org> | 2024-06-26 06:17:15 +0000 |
|---|---|---|
| committer | Daniel Baumann <daniel.baumann@progress-linux.org> | 2024-06-26 06:17:15 +0000 |
| commit | ac8d05af898765571f7f7db4b8bfc8b73907652d (patch) | |
| tree | 0a1a0e03b3c49df9b7713587b9d423dc5d8a2709 /browser/components | |
| parent | Releasing progress-linux version 127.0.1-1~progress7.99u1. (diff) | |
| download | firefox-ac8d05af898765571f7f7db4b8bfc8b73907652d.tar.xz firefox-ac8d05af898765571f7f7db4b8bfc8b73907652d.zip | |
Merging upstream version 127.0.2.
Signed-off-by: Daniel Baumann <daniel.baumann@progress-linux.org>
Diffstat (limited to 'browser/components')
| -rw-r--r-- | browser/components/BrowserContentHandler.sys.mjs | 8 | ||||
| -rw-r--r-- | browser/components/BrowserGlue.sys.mjs | 4 |
2 files changed, 11 insertions, 1 deletions
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, |