Commit 225930cb authored by cypherpunks1's avatar cypherpunks1 Committed by Richard Pospesel
Browse files

fixup! Bug 18905: Hide unwanted items from help menu 

Bug 41642: Hide the new private window option only when autostart of PBM is enabled
parent 174014d9

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

+1 −2
Original line number Diff line number Diff line
@@ -53,8 +53,7 @@ 
                     class="subviewbutton"

                     data-l10n-id="appmenuitem-new-private-window"

                     key="key_privatebrowsing"

                     command="Tools:PrivateBrowsing"

                     hidden="true"/>

                     command="Tools:PrivateBrowsing"/>

      <toolbarseparator/>

      <toolbarbutton id="appMenu-new-identity"

                     class="subviewbutton"

browser/base/content/browser.js

+1 −1
Original line number Diff line number Diff line
@@ -1762,7 +1762,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.