Extension/Platform App window isolation

Hide platform app windows from extensions, and hide all windows that don't
belong to the current app from apps.

Review URL: https://chromiumcodereview.appspot.com/10407035

git-svn-id: svn://svn.chromium.org/chrome/trunk/src@138340 0039d316-1c4b-4281-b951-d872f2087c98

1 files changed, 18 insertions, 6 deletions

diff --git a/chrome/browser/extensions/extension_function.cc b/chrome/browser/extensions/extension_function.cc
index f42910a..614f342c 100644
--- a/chrome/browser/extensions/extension_function.cc
+++ b/chrome/browser/extensions/extension_function.cc
@@ -219,12 +219,24 @@ UIThreadExtensionFunction::GetExtensionWindowController() {
   if (window_controller)
     return window_controller;
 
-  Profile* profile = Profile::FromBrowserContext(
-      render_view_host_->GetProcess()->GetBrowserContext());
-  ExtensionWindowList::ProfileMatchType match_type = include_incognito_
-      ? ExtensionWindowController::MATCH_INCOGNITO
-      : ExtensionWindowController::MATCH_NORMAL_ONLY;
-  return ExtensionWindowList::GetInstance()->CurrentWindow(profile, match_type);
+  return ExtensionWindowList::GetInstance()->CurrentWindowForFunction(this);
+}
+
+bool UIThreadExtensionFunction::CanOperateOnWindow(
+    const ExtensionWindowController* window_controller) const {
+  const extensions::Extension* extension = GetExtension();
+  // |extension| is NULL for unit tests only.
+  if (extension != NULL && !window_controller->IsVisibleToExtension(extension))
+    return false;
+
+  if (profile() == window_controller->profile())
+    return true;
+
+  if (!include_incognito())
+    return false;
+
+  return profile()->HasOffTheRecordProfile() &&
+      profile()->GetOffTheRecordProfile() == window_controller->profile();
 }
 
 void UIThreadExtensionFunction::SendResponse(bool success) {