preserve last closed window state for session restore and undo

Fix #892.  Fix #881. Fix #758

Auditors: @diracdeltas

app/index.js

@@ -36,6 +36,7 @@ let loadAppStatePromise = SessionStore.loadAppState().catch(() => {
 // Used to collect the per window state when shutting down the application
 let perWindowState = []
 let sessionStateStoreAttempted = false
+let lastWindowState
 
 // URLs to accept bad certs for.
 let acceptCertUrls = {}
@@ -49,6 +50,9 @@ const saveIfAllCollected = () => {
   if (perWindowState.length === BrowserWindow.getAllWindows().length) {
     const appState = AppStore.getState().toJS()
     appState.perWindowState = perWindowState
+    if (perWindowState.length === 0 && lastWindowState) {
+      appState.perWindowState.push(lastWindowState)
+    }
     const ignoreCatch = () => {}
 
     // If the status is still UPDATE_AVAILABLE then the user wants to quit
@@ -122,6 +126,19 @@ app.on('ready', function () {
     saveIfAllCollected()
   })
 
+  ipcMain.on(messages.LAST_WINDOW_STATE, (wnd, data) => {
+    if (data) {
+      lastWindowState = data
+    }
+  })
+
+  process.on(messages.UNDO_CLOSED_WINDOW, () => {
+    if (lastWindowState) {
+      appActions.newWindow(undefined, undefined, lastWindowState)
+      lastWindowState = undefined
+    }
+  })
+
   loadAppStatePromise.then(initialState => {
     // For tests we always want to load default app state
     const perWindowState = initialState.perWindowState

app/menu.js

@@ -385,7 +385,10 @@ const init = (settingsState, args) => {
         CommonMenu.separatorMenuItem,
         CommonMenu.reopenLastClosedTabItem, {
           label: 'Reopen Last Closed Window',
-          enabled: false
+          accelerator: 'Alt+Shift+CmdOrCtrl+T',
+          click: function () {
+            process.emit(messages.UNDO_CLOSED_WINDOW)
+          }
         },
         CommonMenu.separatorMenuItem,
         {

js/components/main.js

@@ -140,10 +140,10 @@ class Main extends ImmutableComponent {
     ipc.on(messages.CERT_ERROR, (e, details) => {
       const frames = self.props.windowState.get('frames').filter(frame => frame.get('location') === details.url)
       frames.forEach(frame => {
-        WindowActions.setSecurityState(frame, {
+        windowActions.setSecurityState(frame, {
           certDetails: details
         })
-        WindowActions.loadUrl(frame, 'about:certerror')
+        windowActions.loadUrl(frame, 'about:certerror')
       })
     })
 

js/constants/messages.js

@@ -61,6 +61,8 @@ const messages = {
   // Session restore
   REQUEST_WINDOW_STATE: _,
   RESPONSE_WINDOW_STATE: _,
+  LAST_WINDOW_STATE: _,
+  UNDO_CLOSED_WINDOW: _,
   // Ad block and tracking protection
   BLOCKED_RESOURCE: _,
   // About pages to contentScripts

js/entry.js

@@ -31,3 +31,7 @@ ipc.on(messages.INITIALIZE_WINDOW, (e, appState, frames, initWindowState) => {
 ipc.on(messages.REQUEST_WINDOW_STATE, () => {
   ipc.send(messages.RESPONSE_WINDOW_STATE, WindowStore.getState().toJS())
 })
+
+window.addEventListener('beforeunload', function () {
+  ipc.send(messages.LAST_WINDOW_STATE, WindowStore.getState().toJS())
+})