Commit ec05b47d authored by Arthur Edelstein's avatar Arthur Edelstein Committed by clairehurst
Browse files

BB 18905: Hide unwanted items from help menu 

Bug 25660: Remove the "New Private Window" option
parent ef4bf9f7

browser/base/content/appmenu-viewcache.inc.xhtml

+1 −0
Original line number Diff line number Diff line
@@ -149,6 +149,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"

browser/base/content/browser-menubar.inc

+5 −0
Original line number Diff line number Diff line
@@ -422,6 +422,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"

                          />
@@ -429,11 +430,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"
@@ -450,6 +454,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"/>

browser/base/content/browser-safebrowsing.js

+7 −0
Original line number Diff line number Diff line
@@ -7,6 +7,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

browser/components/reportbrokensite/ReportBrokenSite.sys.mjs

+2 −3
Original line number Diff line number Diff line
@@ -452,9 +452,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;

    if (allowedByPolicy) {

      cmd.setAttribute("hidden", "false"); // see bug 805653

    } else {

toolkit/content/aboutSupport.js

+3 −2
Original line number Diff line number Diff line
@@ -1915,13 +1915,14 @@ function populateActionBox() { 
  if (ResetProfile.resetSupported()) {

    $("reset-box").style.display = "block";

  }

  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").style.display = "block";



    if (Services.policies && !Services.policies.isAllowed("safeMode")) {

      $("restart-in-safe-mode-button").setAttribute("disabled", "true");

    }

  }

  }*/

}



// Prompt user to restart the browser in safe mode