Extension/Platform App window isolation

chrome/browser/extensions/extension_tabs_module.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_tabs_module.h"
 
 #include <algorithm>
 #include <limits>
 #include <vector>
 
@@ skipping 124 matching lines @@
     *browser = GetBrowserInProfileWithId(
         function->profile(), window_id, function->include_incognito(), &error);
     if (!*browser) {
       function->SetError(error);
       return false;
     }
   }
   return true;
 }
 
-ExtensionWindowController::ProfileMatchType ProfileMatchType(
-    bool include_incognito) {
-  return include_incognito ?
-      ExtensionWindowController::MATCH_INCOGNITO
-      : ExtensionWindowController::MATCH_NORMAL_ONLY;
-}
-
 bool GetWindowFromWindowID(UIThreadExtensionFunction* function,
                            int window_id,
                            ExtensionWindowController** controller) {
   if (window_id == extension_misc::kCurrentWindowId) {
     ExtensionWindowController* extension_window_controller =
         function->dispatcher()->delegate()->GetExtensionWindowController();
     // If there is a window controller associated with this extension, use that.
     if (extension_window_controller) {
       *controller = extension_window_controller;
     } else {
       // Otherwise get the focused or most recently added window.
-      *controller = ExtensionWindowList::GetInstance()->CurrentWindow(
-          function->profile(),
-          ProfileMatchType(function->include_incognito()));
+      *controller = ExtensionWindowList::GetInstance()->
+          CurrentWindowForFunction(function);
     }
     if (!(*controller)) {
       function->SetError(keys::kNoCurrentWindowError);
       return false;
     }
   } else {
-    *controller = ExtensionWindowList::GetInstance()->FindWindowById(
-        function->profile(),
-        ProfileMatchType(function->include_incognito()),
-        window_id);
+    *controller = ExtensionWindowList::GetInstance()->FindWindowForFunctionById(
+        function, window_id);
     if (!(*controller)) {
       function->SetError(ExtensionErrorUtils::FormatErrorMessage(
           keys::kWindowNotFoundError, base::IntToString(window_id)));
       return false;
     }
   }
   return true;
 }
 // |error_message| can optionally be passed in and will be set with an
 // appropriate message if the tab cannot be found by id.
@@ skipping 118 matching lines @@
   bool populate_tabs = false;
   if (params->get_info.get() && params->get_info->populate.get())
     populate_tabs = *params->get_info->populate;
 
   ListValue* window_list = new ListValue();
   const ExtensionWindowList::WindowList& windows =
       ExtensionWindowList::GetInstance()->windows();
   for (ExtensionWindowList::WindowList::const_iterator iter =
            windows.begin();
        iter != windows.end(); ++iter) {
-    if (!(*iter)->MatchesProfile(
-            profile(), ProfileMatchType(include_incognito())))
+    if (!this->CanOperateOnWindow(*iter))
       continue;
     if (populate_tabs)
       window_list->Append((*iter)->CreateWindowValueWithTabs());
     else
       window_list->Append((*iter)->CreateWindowValue());
   }
   result_.reset(window_list);
   return true;
 }
 
@@ skipping 1471 matching lines @@
   // called for every API call the extension made.
   GotLanguage(language);
 }
 
 void DetectTabLanguageFunction::GotLanguage(const std::string& language) {
   result_.reset(Value::CreateStringValue(language.c_str()));
   SendResponse(true);
 
   Release();  // Balanced in Run()
 }