From bc042d344d69c9378251ab98561dc29ee552279b Mon Sep 17 00:00:00 2001
From: mrmr1993
Date: Thu, 25 Sep 2014 11:25:49 +0100
Subject: Fail gracefully in restoreTab when runtime.lastError is set

This brings behaviour of the chrome.sessions codepath in line with the
legacy code.
---
 background_scripts/main.coffee | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

(limited to 'background_scripts')

diff --git a/background_scripts/main.coffee b/background_scripts/main.coffee
index 352cfa48..562be033 100644
--- a/background_scripts/main.coffee
+++ b/background_scripts/main.coffee
@@ -250,7 +250,8 @@ BackgroundCommands =
   restoreTab: (callback) ->
     # TODO: remove if-else -block when adopted into stable
     if chrome.sessions
-      chrome.sessions.restore(null, (restoredSession) -> callback())
+      chrome.sessions.restore(null, (restoredSession) ->
+          callback() unless chrome.runtime.lastError)
     else
       # TODO(ilya): Should this be getLastFocused instead?
       chrome.windows.getCurrent((window) ->
-- 
cgit v1.2.3


From f18f3ead03640585fbd78bd9fd1acdbaaec087b1 Mon Sep 17 00:00:00 2001
From: mrmr1993
Date: Thu, 25 Sep 2014 11:35:48 +0100
Subject: Fence off unnecessary tabQueue code when chrome.sessions is defined

---
 background_scripts/main.coffee | 24 +++++++++++++-----------
 1 file changed, 13 insertions(+), 11 deletions(-)

(limited to 'background_scripts')

diff --git a/background_scripts/main.coffee b/background_scripts/main.coffee
index 562be033..f926e750 100644
--- a/background_scripts/main.coffee
+++ b/background_scripts/main.coffee
@@ -411,16 +411,17 @@ chrome.tabs.onRemoved.addListener (tabId) ->
   # If we restore pages that content scripts can't run on, they'll ignore Vimium keystrokes when they
   # reappear. Pretend they never existed and adjust tab indices accordingly. Could possibly expand this into
   # a blacklist in the future.
-  if (/^(chrome|view-source:)[^:]*:\/\/.*/.test(openTabInfo.url))
-    for i of tabQueue[openTabInfo.windowId]
-      if (tabQueue[openTabInfo.windowId][i].positionIndex > openTabInfo.positionIndex)
-        tabQueue[openTabInfo.windowId][i].positionIndex--
-    return
-
-  if (tabQueue[openTabInfo.windowId])
-    tabQueue[openTabInfo.windowId].push(openTabInfo)
-  else
-    tabQueue[openTabInfo.windowId] = [openTabInfo]
+  unless chrome.sessions
+    if (/^(chrome|view-source:)[^:]*:\/\/.*/.test(openTabInfo.url))
+      for i of tabQueue[openTabInfo.windowId]
+        if (tabQueue[openTabInfo.windowId][i].positionIndex > openTabInfo.positionIndex)
+          tabQueue[openTabInfo.windowId][i].positionIndex--
+      return
+
+    if (tabQueue[openTabInfo.windowId])
+      tabQueue[openTabInfo.windowId].push(openTabInfo)
+    else
+      tabQueue[openTabInfo.windowId] = [openTabInfo]
 
   # keep the reference around for a while to wait for the last messages from the closed tab (e.g. for updating
   # scroll position)
@@ -430,7 +431,8 @@ chrome.tabs.onRemoved.addListener (tabId) ->
 
 chrome.tabs.onActiveChanged.addListener (tabId, selectInfo) -> updateActiveState(tabId)
 
-chrome.windows.onRemoved.addListener (windowId) -> delete tabQueue[windowId]
+unless chrome.sessions
+  chrome.windows.onRemoved.addListener (windowId) -> delete tabQueue[windowId]
 
 # End action functions
 
-- 
cgit v1.2.3