Bug 1719463 - Part 7: Remove the Logins, Addons, Preferences and Print buttons from the pre-proton appMenu view. r=Gijs

Differential Revision: https://phabricator.services.mozilla.com/D121807

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

@@ -6,35 +6,6 @@
   <panelview id="appMenu-mainView" class="PanelUI-subView"
              descriptionheightworkaround="true">
     <vbox class="panel-subview-body">
-      <toolbarbutton id="appMenu-logins-button"
-                     class="subviewbutton subviewbutton-iconic"
-                     label="&logins.label;"
-                     oncommand="LoginHelper.openPasswordManager(window, { entryPoint: 'mainmenu' })"
-                     />
-      <toolbarbutton id="appMenu-addons-button"
-                     class="subviewbutton subviewbutton-iconic"
-                     data-l10n-id="appmenuitem-addons-and-themes"
-                     key="key_openAddons"
-                     command="Tools:Addons"
-                     />
-      <toolbarbutton id="appMenu-preferences-button"
-                     class="subviewbutton subviewbutton-iconic"
-#ifdef XP_WIN
-                     label="&preferencesCmd2.label;"
-#else
-                     label="&preferencesCmdUnix.label;"
-#ifdef XP_MACOSX
-                     key="key_preferencesCmdMac"
-#endif
-#endif
-                     oncommand="openPreferences()"
-                     />
-      <toolbarbutton id="appMenu-customize-button"
-                     class="subviewbutton subviewbutton-iconic"
-                     data-l10n-id="appmenu-customizetoolbar"
-                     command="cmd_CustomizeToolbars"
-                     />
-      <toolbarseparator/>
       <toolbarbutton id="appMenu-open-file-button"
                      class="subviewbutton"
                      label="&openFileCmd.label;"
@@ -47,16 +18,6 @@
                      key="key_savePage"
                      command="Browser:SavePage"
                      />
-      <toolbarbutton id="appMenu-print-button"
-                     class="subviewbutton subviewbutton-iconic"
-                     label="&printCmd.label;"
-                     key="printKb"
-#ifdef XP_MACOSX
-                     command="cmd_print"
-#else
-                     command="cmd_printPreview"
-#endif
-                     />
       <toolbarseparator/>
       <toolbarbutton id="appMenu-find-button"
                      class="subviewbutton subviewbutton-iconic"

browser/components/customizableui/content/panelUI.js

@@ -972,7 +972,7 @@ const PanelUI = {
 
   _addedShortcuts: false,
   _formatPrintButtonShortcuts() {
-    let printButton = this.mainView.querySelector("#appMenu-print-button");
+    let printButton = this.mainView.querySelector("#appMenu-print-button2");
     if (printButton) {
       if (
         !Services.prefs.getBoolPref("print.tab_modal.enabled") &&

browser/locales/en-US/chrome/browser/browser.dtd

@@ -56,10 +56,6 @@ this container is a toolbar. This avoids double-speaking. -->
 <!ENTITY newNavigatorCmd.label        "New Window">
 <!ENTITY newPrivateWindow.label     "New Private Window">
 
-<!ENTITY preferencesCmd2.label       "Options">
-<!ENTITY preferencesCmdUnix.label       "Preferences">
-<!ENTITY logins.label                           "Logins and Passwords">
-
 <!ENTITY overflowCustomizeToolbar.label       "Customize Toolbar…">
 <!ENTITY overflowCustomizeToolbar.accesskey   "C">