Commit 5206e479 authored by Sam Foster's avatar Sam Foster
Browse files

Bug 1719463 - Part 12: Remove the Quit button(s) from the pre-proton appMenu view. r=Gijs 

Differential Revision: https://phabricator.services.mozilla.com/D121812
parent b65024a3

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

+0 −12
Original line number Diff line number Diff line
@@ -11,18 +11,6 @@ 
                     hidden="true"

                     closemenu="none"

                     oncommand="PanelUI.showSubView('PanelUI-whatsNew', this)"/>

#ifndef XP_MACOSX

      <toolbarseparator/>

      <toolbarbutton id="appMenu-quit-button"

                     class="subviewbutton subviewbutton-iconic"

#ifdef XP_WIN

                     data-l10n-id="menu-quit-button-win"

#else

                     data-l10n-id="menu-quit-button"

#endif

                     key="key_quitApplication"

                     command="cmd_quitApplication"/>

#endif

    </vbox>

  </panelview>

browser/base/content/browser.js

+0 −4
Original line number Diff line number Diff line
@@ -1828,10 +1828,6 @@ var gBrowserInit = { 
        document,

        "appMenu-quit-button2"

      )?.removeAttribute("key");

      PanelMultiView.getViewNode(

        document,

        "appMenu-quit-button"

      )?.removeAttribute("key");

    }



    this._loadHandled = true;

browser/locales/en-US/browser/menubar.ftl

+0 −9
Original line number Diff line number Diff line
@@ -41,15 +41,6 @@ menu-quit = 
menu-quit-mac =

    .label = Quit { -brand-shorter-name }



# This menu-quit-button string is only used on Linux.

menu-quit-button =

    .label = { menu-quit.label }



# This menu-quit-button-win string is only used on Windows.

menu-quit-button-win =

    .label = { menu-quit.label }

    .tooltip = Exit { -brand-shorter-name }



menu-about =

    .label = About { -brand-shorter-name }

    .accesskey = A