Bug 1828939 - Remove Share URL menu item when MOZ_PROXY_BYPASS_PROTEC…

…TION and restore Share by Email. r=mossop Differential Revision: https://phabricator.services.mozilla.com/D175941 UltraBlame original commit: 9b50848171bfd9bece2d75c4aa9d1f4a024827a9
marco-c · May 31, 2023 · 0ebbd01 · 0ebbd01
1 parent 0b580d4
commit 0ebbd01
Show file tree

Hide file tree

Showing 3 changed files with 10 additions and 1 deletion.
diff --git a/browser/app/profile/firefox.js b/browser/app/profile/firefox.js
@@ -2786,6 +2786,11 @@ pref("first-startup.timeout", 30000);
 #endif
 
 
+#ifdef MOZ_PROXY_BYPASS_PROTECTION
+  pref("browser.menu.share_url.allow", false);
+#endif
+
+
 
 
 

diff --git a/browser/base/content/browser-menubar.inc b/browser/base/content/browser-menubar.inc
@@ -48,7 +48,7 @@
                 <menuitem id="menu_savePage"
                           key="key_savePage"
                           command="Browser:SavePage" data-l10n-id="menu-file-save-page"/>
-#ifndef XP_MACOSX
+#if !defined(XP_MACOSX) || defined(MOZ_PROXY_BYPASS_PROTECTION)
                 <menuitem id="menu_sendLink"
                           command="Browser:SendLink" data-l10n-id="menu-file-email-link"/>
 #endif

diff --git a/browser/base/content/browser.js b/browser/base/content/browser.js
@@ -4737,6 +4737,10 @@ let gShareUtils = {
 
 
   updateShareURLMenuItem(browser, insertAfterEl) {
+    if (!Services.prefs.getBoolPref("browser.menu.share_url.allow", true)) {
+      return;
+    }
+
 
     if (
       AppConstants.platform != "macosx" &&