1 files changed, 11 insertions, 4 deletions
diff --git a/chrome/browser/extensions/window_controller_list.cc b/chrome/browser/extensions/window_controller_list.cc
index 0dfdffa..257c680b 100644
--- a/chrome/browser/extensions/window_controller_list.cc
+++ b/chrome/browser/extensions/window_controller_list.cc
@@ -52,17 +52,24 @@ void WindowControllerList::RemoveObserver(
   observers_.RemoveObserver(observer);
 }
 
-WindowController* WindowControllerList::FindWindowForFunctionById(
-    const UIThreadExtensionFunction* function,
-    int id) const {
+WindowController* WindowControllerList::FindWindowById(int id) const {
   for (ControllerList::const_iterator iter = windows().begin();
        iter != windows().end(); ++iter) {
-    if (function->CanOperateOnWindow(*iter) && (*iter)->GetWindowId() == id)
+    if ((*iter)->GetWindowId() == id)
       return *iter;
   }
   return NULL;
 }
 
+WindowController* WindowControllerList::FindWindowForFunctionById(
+    const UIThreadExtensionFunction* function,
+    int id) const {
+  WindowController* controller = FindWindowById(id);
+  if (controller && function->CanOperateOnWindow(controller))
+    return controller;
+  return NULL;
+}
+
 WindowController* WindowControllerList::CurrentWindowForFunction(
     const UIThreadExtensionFunction* function) const {
   WindowController* result = NULL;