From 528a32fc3c88fd7ef6b78688d4feec50f0866713 Mon Sep 17 00:00:00 2001
From: Richard Marti <richard.marti@gmail.com>
Date: Tue, 13 Sep 2022 22:20:12 +0000
Subject: [PATCH] Bug 1790636 - Remove the Go menu item in the new App Menu.
 r=aleca

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

--HG--
extra : moz-landing-system : lando
---
 calendar/base/content/calendar-views-utils.js |   2 -
 mail/base/content/hiddenWindowMac.js          |  10 --
 mail/base/content/messageWindow.js            |  31 +---
 .../customizableui/content/panelUI.inc.xhtml  | 166 ------------------
 .../customizableui/content/panelUI.js         |   4 -
 mail/components/im/content/chat-messenger.js  |   2 -
 6 files changed, 2 insertions(+), 213 deletions(-)

diff --git a/calendar/base/content/calendar-views-utils.js b/calendar/base/content/calendar-views-utils.js
index 8d2c427a2a..373cdc8381 100644
--- a/calendar/base/content/calendar-views-utils.js
+++ b/calendar/base/content/calendar-views-utils.js
@@ -250,8 +250,6 @@ function switchToView(viewType) {
     "calendar-view-context-menu-previous",
     "calendar-go-menu-next",
     "calendar-go-menu-previous",
-    "appmenu_calendar-go-menu-next",
-    "appmenu_calendar-go-menu-previous",
   ];
   ids.forEach(x => {
     setupViewNode(x, "label");
diff --git a/mail/base/content/hiddenWindowMac.js b/mail/base/content/hiddenWindowMac.js
index 9a40f81687..601a608dbb 100644
--- a/mail/base/content/hiddenWindowMac.js
+++ b/mail/base/content/hiddenWindowMac.js
@@ -95,7 +95,6 @@ function hiddenWindowStartup() {
     "appmenu_saveAsFile",
     "appmenu_newVirtualFolder",
     "appmenu_viewBodyMenu",
-    "appmenu_goNextMenu",
     "appmenu_findAgainCmd",
     "appmenu_sendUnsentMsgs",
     "appmenu_charsetRepairMenuitem",
@@ -118,15 +117,6 @@ function hiddenWindowStartup() {
     "appmenu_viewHeadersMenu",
     "appmenu_find",
     "appmenu_viewAttachmentsInlineMenuitem",
-    "appmenu_nextMsg",
-    "appmenu_nextUnreadMsg",
-    "appmenu_nextUnreadThread",
-    "appmenu_goPreviousMenu",
-    "appmenu_prevMsg",
-    "appmenu_prevUnreadMsg",
-    "appmenu_goForward",
-    "appmenu_goBack",
-    "appmenu_goStartPage",
     "appmenu_viewFullZoomMenu",
     "appmenu_openMessageWindowMenuitem",
   ];
diff --git a/mail/base/content/messageWindow.js b/mail/base/content/messageWindow.js
index 2e99d11980..fc010c92a5 100644
--- a/mail/base/content/messageWindow.js
+++ b/mail/base/content/messageWindow.js
@@ -850,12 +850,7 @@ function HideMenus() {
     fileMenuAfterCompactSeparator.setAttribute("hidden", "true");
   }
 
-  var goStartPageSeparator = document.getElementById("goNextSeparator");
-  if (goStartPageSeparator) {
-    goStartPageSeparator.hidden = true;
-  }
-
-  goStartPageSeparator = document.getElementById("appmenu_goNextSeparator");
+  let goStartPageSeparator = document.getElementById("goNextSeparator");
   if (goStartPageSeparator) {
     goStartPageSeparator.hidden = true;
   }
@@ -867,39 +862,17 @@ function HideMenus() {
     goRecentlyClosedTabsSeparator.setAttribute("hidden", "true");
   }
 
-  goRecentlyClosedTabsSeparator = document.getElementById(
-    "appmenu_goRecentlyClosedTabsSeparator"
-  );
-  if (goRecentlyClosedTabsSeparator) {
-    goRecentlyClosedTabsSeparator.setAttribute("hidden", "true");
-  }
-
   let goFolder = document.getElementById("goFolderMenu");
   if (goFolder) {
     goFolder.hidden = true;
   }
 
-  goFolder = document.getElementById("appmenu_goFolderMenu");
-  if (goFolder) {
-    goFolder.hidden = true;
-  }
-
   goFolder = document.getElementById("goFolderSeparator");
   if (goFolder) {
     goFolder.hidden = true;
   }
 
-  goFolder = document.getElementById("appmenu_goFolderSeparator");
-  if (goFolder) {
-    goFolder.hidden = true;
-  }
-
-  var goStartPage = document.getElementById("goStartPage");
-  if (goStartPage) {
-    goStartPage.hidden = true;
-  }
-
-  goStartPage = document.getElementById("appmenu_goStartPage");
+  let goStartPage = document.getElementById("goStartPage");
   if (goStartPage) {
     goStartPage.hidden = true;
   }
diff --git a/mail/components/customizableui/content/panelUI.inc.xhtml b/mail/components/customizableui/content/panelUI.inc.xhtml
index 1f9ccf5137..e7a2043199 100644
--- a/mail/components/customizableui/content/panelUI.inc.xhtml
+++ b/mail/components/customizableui/content/panelUI.inc.xhtml
@@ -110,11 +110,6 @@
                        label="&fileMenu.label;"
                        closemenu="none"
                        oncommand="PanelUI.showSubView('appMenu-fileView', this)"/>
-        <toolbarbutton id="appmenu_Go"
-                       class="subviewbutton subviewbutton-nav"
-                       label="&goMenu.label;"
-                       closemenu="none"
-                       oncommand="PanelUI.showSubView('appMenu-goView', this)"/>
         <toolbarbutton id="appmenu_toolsMenu"
                        class="subviewbutton subviewbutton-iconic subviewbutton-nav"
                        data-l10n-id="appmenu-tools-panel"
@@ -972,167 +967,6 @@
       </vbox>
     </panelview>
 
-    <!-- Go -->
-    <panelview id="appMenu-goView"
-               title="&goMenu.label;"
-               class="PanelUI-subView">
-      <vbox id="appMenu-goViewItems"
-            class="panel-subview-body">
-        <toolbarbutton id="appmenu_goNextMenu"
-                       class="subviewbutton subviewbutton-nav"
-                       label="&nextMenu.label;"
-                       closemenu="none"
-                       oncommand="PanelUI.showSubView('appMenu-goNextView', this)"/>
-        <toolbarbutton id="appmenu_goPreviousMenu"
-                       class="subviewbutton subviewbutton-nav"
-                       label="&prevMenu.label;"
-                       closemenu="none"
-                       oncommand="PanelUI.showSubView('appMenu-goPreviousView', this)"/>
-        <toolbarbutton id="appmenu_goForward"
-                       class="subviewbutton subviewbutton-iconic"
-                       label="&goForwardCmd.label;"
-                       key="key_goForward"
-                       command="cmd_goForward"/>
-        <toolbarbutton id="appmenu_goBack"
-                       class="subviewbutton subviewbutton-iconic"
-                       label="&goBackCmd.label;"
-                       key="key_goBack"
-                       command="cmd_goBack"/>
-        <toolbarseparator id="appmenu_goNextSeparator"/>
-#ifdef MAIN_WINDOW
-        <toolbarbutton id="appmenu_calendar-go-to-today"
-                       class="subviewbutton subviewbutton-iconic hide-when-calendar-deactivated"
-                       label="&goTodayCmd.label;"
-                       command="calendar_go_to_today_command"/>
-#endif
-        <toolbarbutton id="appmenu_goChat"
-                       class="subviewbutton subviewbutton-iconic"
-                       label="&goChatCmd.label;"
-                       command="cmd_chat"/>
-        <toolbarseparator id="appmenu_goChatSeparator"/>
-        <toolbarbutton id="appmenu_goFolderMenu"
-                       class="subviewbutton subviewbutton-nav"
-                       label="&folderMenu.label;"
-                       closemenu="none"
-                       oncommand="PanelUI.showSubView('appMenu-goFolderView', this)"/>
-        <toolbarseparator id="appmenu_goFolderSeparator"/>
-        <toolbarbutton id="appmenu_goRecentlyClosedTabs"
-                       class="subviewbutton subviewbutton-nav"
-                       label="&goRecentlyClosedTabs.label;"
-                       observes="cmd_undoCloseTab"
-                       closemenu="none"
-                       oncommand="PanelUI.showSubView('appMenu-goRecentlyClosedTabsView', this)"/>
-        <toolbarseparator id="appmenu_goRecentlyClosedTabsSeparator"/>
-        <toolbarbutton id="appmenu_goStartPage"
-                       class="subviewbutton subviewbutton-iconic"
-                       label="&startPageCmd.label;"
-                       key="key_goStartPage"
-                       command="cmd_goStartPage"/>
-      </vbox>
-    </panelview>
-
-    <!-- Go / Next -->
-    <panelview id="appMenu-goNextView"
-               title="&nextMenu.label;"
-               class="PanelUI-subView">
-      <vbox id="appMenu-goNextViewItems"
-            class="panel-subview-body">
-        <toolbarbutton id="appmenu_nextMsg"
-                       class="subviewbutton subviewbutton-iconic"
-                       label="&nextMsgCmd.label;"
-                       key="key_nextMsg"
-                       command="cmd_nextMsg"/>
-        <toolbarbutton id="appmenu_nextUnreadMsg"
-                       class="subviewbutton subviewbutton-iconic"
-                       label="&nextUnreadMsgCmd.label;"
-                       key="key_nextUnreadMsg"
-                       command="cmd_nextUnreadMsg"/>
-        <toolbarbutton id="appmenu_nextFlaggedMsg"
-                       class="subviewbutton subviewbutton-iconic"
-                       label="&nextStarredMsgCmd.label;"
-                       command="cmd_nextFlaggedMsg"/>
-        <toolbarseparator id="appmenu_goNextAfterFlaggedSeparator"/>
-        <toolbarbutton id="appmenu_nextUnreadThread"
-                       class="subviewbutton subviewbutton-iconic"
-                       label="&nextUnreadThread.label;"
-                       key="key_nextUnreadThread"
-                       command="cmd_nextUnreadThread"/>
-#ifdef MAIN_WINDOW
-        <toolbarseparator id="appmenu_GoNextAfterUnreadThreadSeparator"
-                          class="hide-before-calendar-loaded hide-when-calendar-deactivated"/>
-        <!-- Label is set up automatically using the view id. When writing a
-             view extension, add a `label-<myviewtype>` attribute with the
-             correct label. -->
-        <toolbarbutton id="appmenu_calendar-go-menu-next"
-                       class="subviewbutton subviewbutton-iconic hide-before-calendar-loaded hide-when-calendar-deactivated"
-                       label=""
-                       label-day="&lightning.toolbar.day.label;"
-                       label-week="&lightning.toolbar.week.label;"
-                       label-multiweek="&lightning.toolbar.week.label;"
-                       label-month="&lightning.toolbar.month.label;"
-                       command="calendar_view_next_command"/>
-#endif
-      </vbox>
-    </panelview>
-
-    <!-- Go / Previous -->
-    <panelview id="appMenu-goPreviousView"
-               title="&prevMenu.label;"
-               class="PanelUI-subView">
-      <vbox id="appMenu-goPreviousViewItems"
-            class="panel-subview-body">
-        <toolbarbutton id="appmenu_prevMsg"
-                       class="subviewbutton subviewbutton-iconic"
-                       label="&prevMsgCmd.label;"
-                       key="key_previousMsg"
-                       command="cmd_previousMsg"/>
-        <toolbarbutton id="appmenu_prevUnreadMsg"
-                       class="subviewbutton subviewbutton-iconic"
-                       label="&prevUnreadMsgCmd.label;"
-                       key="key_previousUnreadMsg"
-                       command="cmd_previousUnreadMsg"/>
-        <toolbarbutton id="appmenu_prevFlaggedMsg"
-                       class="subviewbutton subviewbutton-iconic"
-                       label="&prevStarredMsgCmd.label;"
-                       command="cmd_previousFlaggedMsg"/>
-#ifdef MAIN_WINDOW
-        <toolbarseparator id="appmenu_goPreviousAfterFlaggedSeparator"
-                          class="hide-before-calendar-loaded hide-when-calendar-deactivated"/>
-        <!-- Label is set up automatically using the view id. When writing a
-             view extension, add a `label-<myviewtype>` attribute with the
-             correct label. -->
-        <toolbarbutton id="appmenu_calendar-go-menu-previous"
-                       class="subviewbutton subviewbutton-iconic hide-when-calendar-deactivated hide-when-calendar-deactivated"
-                       label=""
-                       label-day="&lightning.toolbar.day.label;"
-                       label-week="&lightning.toolbar.week.label;"
-                       label-multiweek="&lightning.toolbar.week.label;"
-                       label-month="&lightning.toolbar.month.label;"
-                       command="calendar_view_prev_command"/>
-#endif
-      </vbox>
-    </panelview>
-
-    <!-- Go / Folder -->
-    <!-- toolbarbuttons are dynamically added by folder-panelview custom element. -->
-    <panelview is="folder-panelview" id="appMenu-goFolderView"
-               title="&folderMenu.label;"
-               class="PanelUI-subView"
-               showFileHereLabel="true"
-               showRecent="true"
-               showFavorites="true"
-               command="cmd_goFolder"
-               recentLabel="&contextMoveCopyMsgRecentMenu.label;"
-               favoritesLabel="&contextMoveCopyMsgFavoritesMenu.label;"/>
-
-    <!-- Go / Recently Closed Tabs -->
-    <!-- Dynamically populated when shown. -->
-    <panelview id="appMenu-goRecentlyClosedTabsView"
-               title="&goRecentlyClosedTabs.label;"
-               class="PanelUI-subView">
-      <vbox class="panel-subview-body"/>
-    </panelview>
-
     <!-- Tools -->
     <panelview id="appMenu-toolsView"
                data-l10n-id="appmenu-tools-panel-title"
diff --git a/mail/components/customizableui/content/panelUI.js b/mail/components/customizableui/content/panelUI.js
index 1e4130a42c..c3667f67fb 100644
--- a/mail/components/customizableui/content/panelUI.js
+++ b/mail/components/customizableui/content/panelUI.js
@@ -420,10 +420,6 @@ const PanelUI = {
       case "appMenu-viewZoomView":
         UpdateFullZoomMenu();
         break;
-      // Go
-      case "appMenu-goRecentlyClosedTabsView":
-        PanelUI._refreshDynamicView(event, InitRecentlyClosedTabsPopup);
-        break;
     }
   },
 
diff --git a/mail/components/im/content/chat-messenger.js b/mail/components/im/content/chat-messenger.js
index b6c4525735..269ce489fb 100644
--- a/mail/components/im/content/chat-messenger.js
+++ b/mail/components/im/content/chat-messenger.js
@@ -1783,8 +1783,6 @@ var chatHandler = {
         "joinChatMenuItem",
         "newIMAccountMenuItem",
         "newIMContactMenuItem",
-        "appmenu_goChat",
-        "appmenu_goChatSeparator",
         "appmenu_newIMAccountMenuItem",
         "appmenu_newIMContactMenuItem",
       ].forEach(function(aId) {