Improved currentTab impl

GoogleChrome · Sep 21, 2016 · f4cf966 · f4cf966
1 parent 30a7036
commit f4cf966
Showing 1 changed file with 12 additions and 8 deletions.
diff --git a/lighthouse-core/gather/drivers/extension.js b/lighthouse-core/gather/drivers/extension.js
@@ -130,19 +130,23 @@ class ExtensionDriver extends Driver {
   }
 
   queryCurrentTab_() {
-    const currentTab = {
-      active: true,
-      windowId: chrome.windows.WINDOW_ID_CURRENT
-    };
-
     return new Promise((resolve, reject) => {
-      chrome.tabs.query(currentTab, tabs => {
+      const queryOpts = {
+        active: true,
+        lastFocusedWindow: true,
+        windowType: 'normal'
+      };
+
+      chrome.tabs.query(queryOpts, (tabs => {
         if (chrome.runtime.lastError) {
           return reject(chrome.runtime.lastError);
         }
-
+        if (tabs.length === 0) {
+          const message = 'Couldn\'t resolve current tab. Please file a bug.';
+          return reject(new Error(message));
+        }
         resolve(tabs[0]);
-      });
+      }));
     });
   }