From a18d97c8974e6e3b28e5ba3a1351a772ab38dd52 Mon Sep 17 00:00:00 2001
From: Edmund Wong <ewong@pw-wspx.org>
Date: Tue, 20 Dec 2011 11:52:07 +0800
Subject: [PATCH] Bug 675589 - Group all session restore menu items together.
 r=IanN

---
 suite/browser/navigatorOverlay.xul | 10 +++++-----
 suite/browser/sessionHistoryUI.js  |  3 ++-
 2 files changed, 7 insertions(+), 6 deletions(-)

diff --git a/suite/browser/navigatorOverlay.xul b/suite/browser/navigatorOverlay.xul
index e87cf46e15..4e401f7df1 100644
--- a/suite/browser/navigatorOverlay.xul
+++ b/suite/browser/navigatorOverlay.xul
@@ -445,6 +445,11 @@
                      onpopupshowing="event.stopPropagation(); updateRecentWindows(this);"
                      oncommand="undoCloseWindow(event.target.value);"/>
         </menu>
+        <menuitem id="historyRestoreLastSession"
+                  label="&historyRestoreLastSession.label;"
+                  accesskey="&historyRestoreLastSession.accesskey;"
+                  oncommand="restoreLastSession();"
+                  disabled="true"/>
         <menuseparator/>
         <menuitem id="menu_showAllHistory"
                   label="&historyCmd.label;"
@@ -453,11 +458,6 @@
                   key="key_gotoHistory"/>
         <menuseparator id="startHistorySeparator" hidden="true"/>
         <menuseparator id="endHistorySeparator" hidden="true"/>
-        <menuitem id="historyRestoreLastSession"
-                  label="&historyRestoreLastSession.label;"
-                  accesskey="&historyRestoreLastSession.accesskey;"
-                  oncommand="restoreLastSession();"
-                  disabled="true"/>
         <menuitem id="sync-tabs-menuitem"
                   label="&syncTabsMenu.label;"
                   oncommand="BrowserOpenSyncTabs();"
diff --git a/suite/browser/sessionHistoryUI.js b/suite/browser/sessionHistoryUI.js
index 529f624f74..8db1effa9d 100644
--- a/suite/browser/sessionHistoryUI.js
+++ b/suite/browser/sessionHistoryUI.js
@@ -100,8 +100,8 @@ function FillHistoryMenu(aParent, aMenu)
         case "go":
           var startHistory = document.getElementById("startHistorySeparator");
           var endHistory = document.getElementById("endHistorySeparator");
+          var syncMenuItem = document.getElementById("sync-tabs-menuitem");
           startHistory.hidden = (count == 0);
-          endHistory.hidden = (endHistory == aParent.lastChild);
           end = count > MAX_HISTORY_MENU_ITEMS ? count - MAX_HISTORY_MENU_ITEMS : 0;
           for (j = count - 1; j >= end; j--)
             {
@@ -110,6 +110,7 @@ function FillHistoryMenu(aParent, aMenu)
                 createRadioMenuItem(aParent, endHistory, j, entry.title, j == index);
             }
           toggleTabsFromOtherComputers();
+          endHistory.hidden = (endHistory == aParent.lastChild || syncMenuItem.hidden);
           break;
       }
     return true;