summaryrefslogtreecommitdiffstats
path: root/browser/components
diff options
context:
space:
mode:
authorDaniel Baumann <daniel.baumann@progress-linux.org>2024-06-26 06:16:27 +0000
committerDaniel Baumann <daniel.baumann@progress-linux.org>2024-06-26 06:16:27 +0000
commitc10c12ce84bcc08d00d37be3f19a8fc23ac535ba (patch)
tree1a07e6b5389c49f68e13bebdf70843884669a31f /browser/components
parentAdding upstream version 127.0.1. (diff)
downloadfirefox-900d52f11297f53a91f131a13a8965d29b5a8c55.tar.xz
firefox-900d52f11297f53a91f131a13a8965d29b5a8c55.zip
Adding upstream version 127.0.2.upstream/127.0.2upstream
Signed-off-by: Daniel Baumann <daniel.baumann@progress-linux.org>
Diffstat (limited to 'browser/components')
-rw-r--r--browser/components/BrowserContentHandler.sys.mjs8
-rw-r--r--browser/components/BrowserGlue.sys.mjs4
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,