Support for chrome.experimental.popup API in ExternalTabContainer views

chrome/renderer/extensions/extension_process_bindings.cc

 // Copyright (c) 2009 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/renderer/extensions/extension_process_bindings.h"
 
 #include <map>
 #include <set>
 #include <string>
 #include <vector>
@@ skipping 129 matching lines @@
     if (!ViewTypeMatches(render_view->view_type(), view_type_))
       return true;
 
     GURL url = render_view->webview()->mainFrame()->url();
     if (!url.SchemeIs(chrome::kExtensionScheme))
       return true;
     const std::string& extension_id = url.host();
     if (extension_id != extension_id_)
       return true;
 
-    if (browser_window_id_ != -1 &&
-        render_view->browser_window_id() != browser_window_id_)
-      return true;
+    // If we are searching for a pop-up, it may be the case that the pop-up
+    // is not attached to a browser window instance.  (It is hosted in a
+    // ExternalTabContainer.)  If so, then bypass validation of
+    // same-browser-window origin.
+    // TODO(twiz):  The browser window id of the views visited should always
+    // match that of the arguments to the accumulator.
+    // See bug:  http://crbug.com/29646
+    if (!(view_type_ == ViewType::EXTENSION_POPUP &&
+          render_view->browser_window_id() == -1)) {
+      if (browser_window_id_ != -1 &&
+          render_view->browser_window_id() != browser_window_id_) {
+        return true;
+      }
+    }
 
     v8::Local<v8::Context> context =
         render_view->webview()->mainFrame()->mainWorldScriptContext();
     if (!context.IsEmpty()) {
       v8::Local<v8::Value> window = context->Global();
       DCHECK(!window.IsEmpty());
 
       if (!OnMatchedView(window))
         return false;
     }
@@ skipping 551 matching lines @@
     return;
 
   v8::HandleScope handle_scope;
   WebFrame* frame = view->mainFrame();
   v8::Local<v8::Context> context = frame->mainWorldScriptContext();
   v8::Handle<v8::Value> argv[1];
   argv[0] = v8::String::New(type_str);
   bindings_utils::CallFunctionInContext(context, "setViewType",
                                         arraysize(argv), argv);
 }