Browser tag shim

chrome/common/extensions/extension_set.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/common/extensions/extension_set.h"
 
 #include "base/logging.h"
 #include "chrome/common/extensions/extension.h"
 #include "chrome/common/url_constants.h"
+#include "third_party/WebKit/Source/WebKit/chromium/public/platform/WebCString.h"
+#include "third_party/WebKit/Source/WebKit/chromium/public/platform/WebString.h"
 
 using WebKit::WebSecurityOrigin;
+using WebKit::WebString;
 using extensions::Extension;
 
 ExtensionURLInfo::ExtensionURLInfo(WebSecurityOrigin origin, const GURL& url)
   : origin_(origin),
     url_(url) {
   DCHECK(!origin_.isNull());
 }
 
 ExtensionURLInfo::ExtensionURLInfo(const GURL& url)
   : url_(url) {
@@ skipping 47 matching lines @@
 
   const Extension* extension = GetExtensionOrAppByURL(info);
   if (!extension)
     return "";
 
   return extension->id();
 }
 
 const Extension* ExtensionSet::GetExtensionOrAppByURL(
     const ExtensionURLInfo& info) const {
-  // In the common case, the document's origin will correspond to its URL,
-  // but in some rare cases involving sandboxing, the two will be different.
-  // We catch those cases by checking whether the document's origin is unique.
-  // If that's not the case, then we conclude that the document's security
-  // context is well-described by its URL and proceed to use only the URL.
-  if (!info.origin().isNull() && info.origin().isUnique())
-    return NULL;
+  if (!info.origin().isNull()) {
+    // In the common case, the document's origin will correspond to its URL,
+    // but in some rare cases involving sandboxing, the two will be different.
+    // We catch those cases by checking whether the document's origin is unique.
+    if (info.origin().isUnique())
+      return NULL;
+
+    // Additionally, the url will initialy be null during a window.open call

[Mihai Parparita -not on Chrome, 2012/06/21 01:30:11]

Adam, you expressed a wish to always use the origin in http://crrev.com/112655,
so this seems like a move in the right direction.

The place where the URL was null during window.open is at
http://code.google.com/searchframe#OAMlx_jo-ck/src/chrome/renderer/chrome_ren....
Is this because the load isn't committed at that point? Should I be passing in
the data source URL instead?

+    // with an extension URL, but the origin will be set correctly. If we have
+    // an extension host origin, then that should be enough to determine which
+    // extension we need.
+    if (info.origin().protocol() ==
+        WebString::fromUTF8(chrome::kExtensionScheme))
+      return GetByID(info.origin().host().utf8().data());
+  }
 
   if (info.url().SchemeIs(chrome::kExtensionScheme))
     return GetByID(info.url().host());
 
   return GetHostedAppByURL(info);
 }
 
 const Extension* ExtensionSet::GetHostedAppByURL(
     const ExtensionURLInfo& info) const {
   for (ExtensionMap::const_iterator iter = extensions_.begin();
@@ skipping 53 matching lines @@
     return true;
 
   if (info.url().SchemeIs(chrome::kExtensionScheme)) {
     const Extension* extension = GetByID(info.url().host());
     if (extension) {
       return extension->IsSandboxedPage(info.url().path());
     }
   }
   return false;
 }