Verified Commit 29954180 authored by Arthur Edelstein's avatar Arthur Edelstein Committed by Pier Angelo Vendrame
Browse files

BB 18905: Hide unwanted items from help menu 

Bug 25660: Remove the "New Private Window" option
parent 0533028d

browser/base/content/browser-menubar.inc

+4 −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"

                          />
@@ -431,9 +432,11 @@ 
                          disabled="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 +453,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

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