Extension/Platform App window isolation

chrome/browser/extensions/extension_function.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_function.h"
 
 #include "base/json/json_writer.h"
 #include "base/logging.h"
 #include "chrome/browser/extensions/extension_function_dispatcher.h"
 #include "chrome/browser/extensions/extension_service.h"
@@ skipping 201 matching lines @@
 }
 
 ExtensionWindowController*
 UIThreadExtensionFunction::GetExtensionWindowController() {
   // If the delegate has an associated window controller, return it.
   ExtensionWindowController* window_controller =
       dispatcher()->delegate()->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) {
   if (delegate_) {
     delegate_->OnSendResponse(this, success, bad_message_);
   } else {
     if (!render_view_host_ || !dispatcher())
       return;
 
     SendResponseImpl(render_view_host_->GetProcess()->GetHandle(),
@@ skipping 45 matching lines @@
 
 SyncIOThreadExtensionFunction::SyncIOThreadExtensionFunction() {
 }
 
 SyncIOThreadExtensionFunction::~SyncIOThreadExtensionFunction() {
 }
 
 void SyncIOThreadExtensionFunction::Run() {
   SendResponse(RunImpl());
 }