Extension/Platform App window isolation

chrome/browser/extensions/extension_window_controller.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_controller.h"
 
 #include "base/values.h"
+#include "chrome/browser/extensions/extension_function.h"
 #include "chrome/browser/extensions/extension_tabs_module_constants.h"
 #include "chrome/browser/extensions/extension_window_list.h"
 #include "chrome/browser/profiles/profile.h"
 #include "chrome/browser/ui/base_window.h"
 #include "ui/gfx/rect.h"
 
 ///////////////////////////////////////////////////////////////////////////////
 // ExtensionWindowController
 
 ExtensionWindowController::ExtensionWindowController(BaseWindow* window,
                                                      Profile* profile) :
     window_(window),
     profile_(profile) {
   ExtensionWindowList::GetInstance()->AddExtensionWindow(this);
 }
 
 ExtensionWindowController::~ExtensionWindowController() {
   ExtensionWindowList::GetInstance()->RemoveExtensionWindow(this);
 }
 
-bool ExtensionWindowController::MatchesProfile(
-    Profile* match_profile,
-    ProfileMatchType match_type) const {
-  return ((profile_ == match_profile) ||
-          (match_type == MATCH_INCOGNITO &&
-           (match_profile->HasOffTheRecordProfile() &&
-            match_profile->GetOffTheRecordProfile() == profile_)));
+bool ExtensionWindowController::IsVisibleToFunction(
+    UIThreadExtensionFunction* function) const {

[stevenjb, 2012/05/21 19:22:52]

It seems like this might be better if this were in UIThreadExtensionFunction
instead of here.

[Mihai Parparita -not on Chrome, 2012/05/21 21:10:06]

Done.

+  const Extension* extension = function->GetExtension();
+  // |extension| is NULL for unit tests only.
+  if (extension != NULL && !IsVisibleToExtension(function->GetExtension()))

[stevenjb, 2012/05/21 19:22:52]

This would become window->IsVisibleToExtension(GetExtension())
(IsVisibleToExtension would need to be public)

+    return false;
+
+  if (function->profile() == profile_)

[stevenjb, 2012/05/21 19:22:52]

profile() == window->profile()

+    return true;
+
+  if (!function->include_incognito())
+    return false;
+
+  return function->profile()->HasOffTheRecordProfile() &&
+      function->profile()->GetOffTheRecordProfile() == profile_;

[stevenjb, 2012/05/21 19:22:52]

The above has more to do with function than with window, so makes more sense in
UIThreadExtensionFunction.

 }
 
 Browser* ExtensionWindowController::GetBrowser() const {
   return NULL;
 }
 
 namespace keys = extension_tabs_module_constants;
 
 base::DictionaryValue* ExtensionWindowController::CreateWindowValue() const {
   DictionaryValue* result = new DictionaryValue();
@@ skipping 21 matching lines @@
     bounds = window()->GetRestoredBounds();
   else
     bounds = window()->GetBounds();
   result->SetInteger(keys::kLeftKey, bounds.x());
   result->SetInteger(keys::kTopKey, bounds.y());
   result->SetInteger(keys::kWidthKey, bounds.width());
   result->SetInteger(keys::kHeightKey, bounds.height());
 
   return result;
 }