Skip to content
Snippets Groups Projects
Verified Commit 942e2690 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 ffe235df
No related branches found
No related tags found
No related merge requests found
......@@ -172,7 +172,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"
......
......@@ -283,7 +283,10 @@ 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.
......
......@@ -452,6 +452,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
......@@ -466,14 +467,17 @@
appmenu-data-l10n-id="menu-report-broken-site"/>
<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"
......
......@@ -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
......
0% Loading or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment