Cloned from issue http://codereview.chromium.org/5277004/ by rogerta@chromium...

ceee/firefox/content/window_api.js

 // Copyright (c) 2010 The Chromium Authors. All rights reserved.
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
 /**
  * @fileoverview This file contains the implementation of the Chrome extension
  * windows APIs for the CEEE Firefox add-on.  This file is loaded by the
  * overlay.xul file, and requires that overlay.js has already been loaded.
  *
  * @supported Firefox 3.x
@@ skipping 125 matching lines @@
   if (!win) {
     throw(new Error(CEEE_window_internal_.CMD_GET_WINDOW +
                     ': invalid window id=' + id));
   }
 
   return this.buildWindowValue(win);
 };
 
 CEEE_window_internal_.CMD_GET_CURRENT_WINDOW = 'windows.getCurrent';
 CEEE_window_internal_.getCurrentWindow_ = function(cmd, data) {
-  return this.buildWindowValue(window);
+  var tab = data.tab;
+  if (tab) {
+    var win = CEEE_mozilla_windows.findWindowFromCfSessionId(tab.id);
+    if (win)
+      return this.buildWindowValue(win);
+  }
 };
 
 CEEE_window_internal_.CMD_GET_LAST_FOCUSED_WINDOW =
     'windows.getLastFocused';
 CEEE_window_internal_.getLastFocusedWindow_ = function(cmd, data) {
   var win = CEEE_mozilla_windows.service.getMostRecentWindow(
       CEEE_mozilla_windows.WINDOW_TYPE);
   return this.buildWindowValue(win);
 };
 
@@ skipping 189 matching lines @@
                                         windows,
                                         windows.removeWindow_);
 
   // Install the error/status reporting methods for this module from the
   // owning CEEE instance.
   windows.logInfo_ = ceeeInstance.logInfo;
   windows.logError_ = ceeeInstance.logError;
 
   return windows;
 }