tor-browser

commit 11bc28febf77cb346598a76d021760a11730f8e7
parent 1b23b0f08dd2fd5880ce916b4f8abd446aba704f
Author: Arthur Edelstein <arthuredelstein@gmail.com>
Date:   Tue, 26 Apr 2016 15:59:36 -0700

BB 18905: Hide unwanted items from help menu

Bug 25660: Remove the "New Private Window" option

Diffstat:
M
browser/base/content/appmenu-viewcache.inc.xhtml
 | 
1
+
M
browser/base/content/browser-menubar.inc
 | 
5
+++++
M
browser/base/content/browser-safebrowsing.js
 | 
7
+++++++
M
browser/components/reportbrokensite/ReportBrokenSite.sys.mjs
 | 
5
++---
M
toolkit/content/aboutSupport.js
 | 
5
+++--

5 files changed, 18 insertions(+), 5 deletions(-)
diff --git a/browser/base/content/appmenu-viewcache.inc.xhtml b/browser/base/content/appmenu-viewcache.inc.xhtml
@@ -161,6 +161,7 @@
                      data-l10n-id="appmenuitem-report-broken-site"
                      closemenu="none"
                      disabled="true"
+                     hidden="true"
                      command="cmd_reportBrokenSite"/>
       <toolbarbutton id="appMenu-help-button2"
                      class="subviewbutton subviewbutton-nav"
diff --git a/browser/base/content/browser-menubar.inc b/browser/base/content/browser-menubar.inc
@@ -442,6 +442,7 @@
 <!-- Note: Items under here are cloned to the AppMenu Help submenu. The cloned items
      have their strings defined by appmenu-data-l10n-id. -->
                 <menuitem id="menu_openHelp"
+                          hidden="true"
                           data-l10n-id="menu-get-help"
                           appmenu-data-l10n-id="appmenu-get-help"
                           />
@@ -449,11 +450,14 @@
                           command="cmd_reportBrokenSite"
                           data-l10n-id="menu-report-broken-site"
                           disabled="true"
+                          hidden="true"
                           appmenu-data-l10n-id="appmenuitem-report-broken-site"/>
                 <menuitem id="feedbackPage"
+                          hidden="true"
                           data-l10n-id="menu-help-share-ideas"
                           appmenu-data-l10n-id="appmenu-help-share-ideas"/>
                 <menuitem id="helpSafeMode"
+                          hidden="true"
                           data-l10n-id="menu-help-enter-troubleshoot-mode2"
                           appmenu-data-l10n-id="appmenu-help-enter-troubleshoot-mode2"/>
                 <menuitem id="troubleShooting"
@@ -470,6 +474,7 @@
                           appmenu-data-l10n-id="appmenu-help-not-deceptive"
                           hidden="true"/>
                 <menuitem id="helpSwitchDevice"
+                          hidden="true"
                           data-l10n-id="menu-help-switch-device"
                           appmenu-data-l10n-id="appmenu-help-switch-device"/>
                 <menuseparator id="aboutSeparator"/>
diff --git a/browser/base/content/browser-safebrowsing.js b/browser/base/content/browser-safebrowsing.js
@@ -4,6 +4,13 @@
 
 var gSafeBrowsing = {
   setReportPhishingMenu() {
+    // tor-browser#18905: hide these menu entries
+    if (
+      !Services.prefs.getBoolPref("browser.safebrowsing.phishing.enabled", true)
+    ) {
+      return;
+    }
+
     // In order to detect whether or not we're at the phishing warning
     // page, we have to check the documentURI instead of the currentURI.
     // This is because when the DocShell loads an error page, the
diff --git a/browser/components/reportbrokensite/ReportBrokenSite.sys.mjs b/browser/components/reportbrokensite/ReportBrokenSite.sys.mjs
@@ -512,9 +512,8 @@ export var ReportBrokenSite = new (class ReportBrokenSite {
     // Altering the disabled attribute on the command does not propagate
     // the change to the related menuitems (see bug 805653), so we change them all.
     const cmd = document.getElementById("cmd_reportBrokenSite");
-    const allowedByPolicy = Services.policies.isAllowed(
-      "DisableFeedbackCommands"
-    );
+    // Hide the items in base-browser. tor-browser#43903.
+    const allowedByPolicy = false;
     cmd.toggleAttribute("hidden", !allowedByPolicy);
     const app = document.ownerGlobal.PanelMultiView.getViewNode(
       document,
diff --git a/toolkit/content/aboutSupport.js b/toolkit/content/aboutSupport.js
@@ -2032,13 +2032,14 @@ function populateActionBox() {
   if (ResetProfile.resetSupported()) {
     $("reset-box").hidden = false;
   }
-  if (!Services.appinfo.inSafeMode && AppConstants.platform !== "android") {
+  // tor-browser#41755: Do not show safe mode, as it would disable NoScript.
+  /*if (!Services.appinfo.inSafeMode && AppConstants.platform !== "android") {
     $("safe-mode-box").hidden = false;
 
     if (Services.policies && !Services.policies.isAllowed("safeMode")) {
       $("restart-in-safe-mode-button").setAttribute("disabled", "true");
     }
-  }
+  }*/
 }
 
 // Prompt user to restart the browser in safe mode