commit b72f495c9593bb7df8fab34b642325c22e4e7393 Author: Arthur Edelstein arthuredelstein@gmail.com Date: Tue Apr 26 15:59:36 2016 -0700

Bug 18905: Hide unusable items from help menu --- src/chrome.manifest | 3 +++ src/chrome/content/menu-overlay.xul | 18 ++++++++++++++++++ 2 files changed, 21 insertions(+)

diff --git a/src/chrome.manifest b/src/chrome.manifest index 30aa2ff..e85a205 100644 --- a/src/chrome.manifest +++ b/src/chrome.manifest @@ -12,6 +12,9 @@ override chrome://branding/locale/brand.dtd chrome://torbutton/locale/brand.dtd override chrome://branding/locale/brand.properties chrome://torbutton/locale/brand.properties overlay chrome://browser/content/aboutDialog.xul chrome://torbutton/content/aboutDialog.xul

+# UI customization +overlay chrome://browser/content/baseMenuOverlay.xul chrome://torbutton/content/menu-overlay.xul + # Strings for the about:tbupdate page override chrome://browser/locale/aboutTBUpdate.dtd chrome://torbutton/locale/aboutTBUpdate.dtd

diff --git a/src/chrome/content/menu-overlay.xul b/src/chrome/content/menu-overlay.xul new file mode 100644 index 0000000..ceadf85 --- /dev/null +++ b/src/chrome/content/menu-overlay.xul @@ -0,0 +1,18 @@ +<?xml version="1.0" encoding="UTF-8"?> <!-- -*- Mode: HTML -*- --> + +<!-- Bug 18905: Hide unused help menu items --> +<overlay id="torbutton-menu-overlay" + xmlns="http://www.mozilla.org/keymaster/gatekeeper/there.is.only.xul%22%3E + <menupopup id="menu_HelpPopup"> + <menuitem id="menu_openHelp" removeelement="true"/> + <menuitem id="menu_openTour" removeelement="true"/> + <menuitem id="healthReport" removeelement="true"/> + <menuitem id="feedbackPage" removeelement="true"/> + <menuitem id="helpSafeMode" removeelement="true"/> + <menuitem id="menu_HelpPopup_reportPhishingtoolmenu" removeelement="true"/> + <menuitem id="menu_HelpPopup_reportPhishingErrortoolmenu" removeelement="true"/> + <!-- dummy elements to avoid 'getElementById' errors --> + <box id="menu_HelpPopup_reportPhishingtoolmenu"/> + <box id="menu_HelpPopup_reportPhishingErrortoolmenu"/> + </menupopup> +</overlay>