From ab2a7481647334e8d48cd253a09b6af0440f1850 Mon Sep 17 00:00:00 2001
From: Brian Grinstead <bgrinstead@mozilla.com>
Date: Mon, 2 Jul 2018 10:42:35 -0700
Subject: [PATCH] Bug 1471734 - Remove FULL_BROWSER_WINDOW preprocessor
 directive;r=Gijs

The key used to be removed from the markup. This changes it to include
the <key> but instead disable it through the related command, which fits
the pattern used with other commands.

MozReview-Commit-ID: LPuwULDt22W

--HG--
extra : rebase_source : f463e41602b6c34c4cfcc2254d78647724117318
---
 browser/base/content/browser-sets.inc | 2 --
 browser/base/content/browser.js       | 2 +-
 browser/base/content/browser.xul      | 2 --
 3 files changed, 1 insertion(+), 5 deletions(-)

diff --git a/browser/base/content/browser-sets.inc b/browser/base/content/browser-sets.inc
index f98ef43a53ce..50d46e7417a1 100644
--- a/browser/base/content/browser-sets.inc
+++ b/browser/base/content/browser-sets.inc
@@ -365,9 +365,7 @@
 #endif
          reserved="true"/>
 
-#ifdef FULL_BROWSER_WINDOW
     <key id="key_undoCloseTab" command="History:UndoCloseTab" key="&tabCmd.commandkey;" modifiers="accel,shift"/>
-#endif
     <key id="key_undoCloseWindow" command="History:UndoCloseWindow" key="&newNavigatorCmd.key;" modifiers="accel,shift"/>
 
 #ifdef XP_GNOME
diff --git a/browser/base/content/browser.js b/browser/base/content/browser.js
index e6790c3622a1..3074df863fa1 100644
--- a/browser/base/content/browser.js
+++ b/browser/base/content/browser.js
@@ -1956,7 +1956,7 @@ if (AppConstants.platform == "macosx") {
                          "viewToolbarsMenu", "viewSidebarMenuMenu", "Browser:Reload",
                          "viewFullZoomMenu", "pageStyleMenu", "charsetMenu", "View:PageSource", "View:FullScreen",
                          "viewHistorySidebar", "Browser:AddBookmarkAs", "Browser:BookmarkAllTabs",
-                         "View:PageInfo"];
+                         "View:PageInfo", "History:UndoCloseTab"];
     var element;
 
     for (let disabledItem of disabledItems) {
diff --git a/browser/base/content/browser.xul b/browser/base/content/browser.xul
index 674511cbbb1d..5c2a407283d3 100644
--- a/browser/base/content/browser.xul
+++ b/browser/base/content/browser.xul
@@ -89,9 +89,7 @@
 # All sets except for popupsets (commands, keys, stringbundles and broadcasters)
 # *must* go into the browser-sets.inc file so that they can be shared with other
 # top level windows in macWindow.inc.xul.
-#define FULL_BROWSER_WINDOW
 #include browser-sets.inc
-#undef FULL_BROWSER_WINDOW
 
   <popupset id="mainPopupSet">
     <menupopup id="tabContextMenu"