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

Bug 18905: Hide unwanted items from help menu 

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

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

+2 −1
Original line number Diff line number Diff line
@@ -181,7 +181,8 @@ 
      <toolbarbutton id="appMenu-restoreSession"

                     data-l10n-id="appmenu-restore-session"

                     class="subviewbutton"

                     command="Browser:RestoreLastSession"/>

                     command="Browser:RestoreLastSession"

                     hidden="true"/>

      <toolbarseparator/>

      <toolbarbutton id="appMenuClearRecentHistory"

                     data-l10n-id="appmenu-clear-history"

browser/base/content/browser-menubar.inc

+4 −0
Original line number Diff line number Diff line
@@ -459,6 +459,7 @@ 
     have their strings defined by appmenu-data-l10n-id. -->

                <menuitem id="menu_openHelp"

                          oncommand="openHelpLink('firefox-help')"

                          hidden="true"

                          data-l10n-id="menu-get-help"

                          appmenu-data-l10n-id="appmenu-get-help"

#ifdef XP_MACOSX
@@ -468,14 +469,17 @@ 
#endif

                <menuitem id="feedbackPage"

                          oncommand="openFeedbackPage()"

                          hidden="true"

                          data-l10n-id="menu-help-share-ideas"

                          appmenu-data-l10n-id="appmenu-help-share-ideas"/>

                <menuitem id="helpSafeMode"

                          oncommand="safeModeRestart();"

                          hidden="true"

                          data-l10n-id="menu-help-enter-troubleshoot-mode2"

                          appmenu-data-l10n-id="appmenu-help-enter-troubleshoot-mode2"/>

                <menuitem id="troubleShooting"

                          oncommand="openTroubleshootingPage()"

                          hidden="true"

                          data-l10n-id="menu-help-more-troubleshooting-info"

                          appmenu-data-l10n-id="appmenu-help-more-troubleshooting-info"/>

                <menuitem id="help_reportSiteIssue"

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/base/content/browser.js

+1 −1
Original line number Diff line number Diff line
@@ -1772,7 +1772,7 @@ var gBrowserInit = { 
    this._boundDelayedStartup = this._delayedStartup.bind(this);

    window.addEventListener("MozAfterPaint", this._boundDelayedStartup);



    if (!PrivateBrowsingUtils.enabled) {

    if (PrivateBrowsingUtils.permanentPrivateBrowsing || !PrivateBrowsingUtils.enabled) {

      document.getElementById("Tools:PrivateBrowsing").hidden = true;

      // Setting disabled doesn't disable the shortcut, so we just remove

      // the keybinding.