From aaafdebefd1772b3ff36f039b704ec84ce80e1a8 Mon Sep 17 00:00:00 2001
From: Deathamns <deathamns@gmail.com>
Date: Thu, 12 Mar 2015 15:07:55 +0100
Subject: [PATCH] Chrome: fix tab/window focusing issues

- Opening a tab from incognito window didn't focus the target window
- Previously active tab was visible for a brief moment when an already
  opened tab was selected from another window
---
 platform/chromium/vapi-background.js | 17 +++++++++++++----
 1 file changed, 13 insertions(+), 4 deletions(-)

diff --git a/platform/chromium/vapi-background.js b/platform/chromium/vapi-background.js
index 5cf370764..50c80d40f 100644
--- a/platform/chromium/vapi-background.js
+++ b/platform/chromium/vapi-background.js
@@ -159,12 +159,20 @@ vAPI.tabs.open = function(details) {
                 active: !!details.active
             };
 
+            // Opening a tab from incognito window won't focus the window
+            // in which the tab was opened
+            var focusWindow = function(tab) {
+                if ( tab.active ) {
+                    chrome.windows.update(tab.windowId, { focused: true });
+                }
+            };
+
             if ( !details.tabId ) {
                 if ( details.index !== undefined ) {
                     _details.index = details.index;
                 }
 
-                chrome.tabs.create(_details);
+                chrome.tabs.create(_details, focusWindow);
                 return;
             }
 
@@ -172,7 +180,7 @@ vAPI.tabs.open = function(details) {
             chrome.tabs.update(parseInt(details.tabId, 10), _details, function(tab) {
                 // if the tab doesn't exist
                 if ( vAPI.lastError() ) {
-                    chrome.tabs.create(_details);
+                    chrome.tabs.create(_details, focusWindow);
                 } else if ( details.index !== undefined ) {
                     chrome.tabs.move(tab.id, {index: details.index});
                 }
@@ -203,8 +211,9 @@ vAPI.tabs.open = function(details) {
     chrome.tabs.query({ url: targetURL }, function(tabs) {
         var tab = tabs[0];
         if ( tab ) {
-            chrome.windows.update(tab.windowId, { focused: true });
-            chrome.tabs.update(tab.id, { active: true });
+            chrome.tabs.update(tab.id, { active: true }, function(tab) {
+                chrome.windows.update(tab.windowId, { focused: true });
+            });
         } else {
             wrapper();
         }