Extension/Platform App window isolation

chrome/browser/extensions/extension_window_list.cc

 // Copyright (c) 2012 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.
 
 #include "chrome/browser/extensions/extension_window_list.h"
 
 #include <algorithm>
 
+#include "chrome/browser/extensions/extension_function.h"
 #include "chrome/browser/sessions/session_id.h"
 #include "chrome/browser/ui/base_window.h"
 
 ///////////////////////////////////////////////////////////////////////////////
 // ExtensionWindowList
 
 // static
 ExtensionWindowList* ExtensionWindowList::GetInstance() {
   return Singleton<ExtensionWindowList>::get();
 }
@@ skipping 11 matching lines @@
 
 void ExtensionWindowList::RemoveExtensionWindow(
     ExtensionWindowController* window) {
   WindowList::iterator iter = std::find(
       windows_.begin(), windows_.end(), window);
   if (iter != windows_.end())
     windows_.erase(iter);
 }
 
 ExtensionWindowController* ExtensionWindowList::FindWindowById(
-    Profile* profile,
-    ProfileMatchType match_type,
+    const UIThreadExtensionFunction* function,

[stevenjb, 2012/05/21 21:55:42]

nit: Maybe we should rename this something like FindWindowForFunction?

[Mihai Parparita -not on Chrome, 2012/05/21 22:05:29]

Done.

     int id) const {
   for (WindowList::const_iterator iter = windows().begin();
        iter != windows().end(); ++iter) {
-    if ((*iter)->MatchesProfile(profile, match_type)) {
-      if ((*iter)->GetWindowId() == id)
-        return *iter;
-    }
+    if (function->CanOperateOnWindow(*iter) && (*iter)->GetWindowId() == id)
+      return *iter;
   }
   return NULL;
 }
 
 ExtensionWindowController* ExtensionWindowList::CurrentWindow(
-    Profile* profile,
-    ProfileMatchType match_type) const {
+    const UIThreadExtensionFunction* function) const {

[stevenjb, 2012/05/21 21:55:42]

nit: Maybe CurrentWindowForFunction?

[Mihai Parparita -not on Chrome, 2012/05/21 22:05:29]

Done.

   ExtensionWindowController* result = NULL;
   // Returns either the focused window (if any), or the last window in the list.
   for (WindowList::const_iterator iter = windows().begin();
        iter != windows().end(); ++iter) {
-    if ((*iter)->MatchesProfile(profile, match_type)) {
+    if (function->CanOperateOnWindow(*iter)) {
       result = *iter;
       if (result->window()->IsActive())
         break;  // use focused window
     }
   }
   return result;
 }