Plumb the correct owner document through DocumentInit::m_owner.

extensions/renderer/app_window_custom_bindings.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 "extensions/renderer/app_window_custom_bindings.h"
 
 #include "base/command_line.h"
 #include "content/public/child/v8_value_converter.h"
 #include "content/public/renderer/render_frame.h"
 #include "content/public/renderer/render_thread.h"
@@ skipping 33 matching lines @@
   bool notify_browser = args[1]->BooleanValue();
 
   if (frame_id == MSG_ROUTING_NONE)
     return;
 
   content::RenderFrame* app_frame =
       content::RenderFrame::FromRoutingID(frame_id);
   if (!app_frame)
     return;
 
-  // TODO(jeremya): it doesn't really make sense to set the opener here, but we
-  // need to make sure the security origin is set up before returning the DOM
-  // reference. A better way to do this would be to have the browser pass the
-  // opener through so opener_id is set in RenderViewImpl's constructor.
-  content::RenderFrame* context_render_frame = context()->GetRenderFrame();
-  if (!context_render_frame)
-    return;
-
-  blink::WebFrame* opener = context_render_frame->GetWebFrame();
-  blink::WebLocalFrame* app_web_frame = app_frame->GetWebFrame();
-  app_web_frame->setOpener(opener);
-
   if (notify_browser) {
     content::RenderThread::Get()->Send(new ExtensionHostMsg_AppWindowReady(
         app_frame->GetRenderView()->GetRoutingID()));
   }
 
   v8::Local<v8::Value> window =
-      app_web_frame->mainWorldScriptContext()->Global();
+      app_frame->GetWebFrame()->mainWorldScriptContext()->Global();
   args.GetReturnValue().Set(window);
 }
 
 void AppWindowCustomBindings::GetWindowControlsHtmlTemplate(
     const v8::FunctionCallbackInfo<v8::Value>& args) {
   CHECK_EQ(args.Length(), 0);
 
   v8::Local<v8::Value> result = v8::String::Empty(args.GetIsolate());
   if (base::CommandLine::ForCurrentProcess()->HasSwitch(
           switches::kEnableAppWindowControls)) {
     base::StringValue value(
         ResourceBundle::GetSharedInstance()
             .GetRawDataResource(IDR_WINDOW_CONTROLS_TEMPLATE_HTML)
             .as_string());
     scoped_ptr<content::V8ValueConverter> converter(
         content::V8ValueConverter::create());
     result = converter->ToV8Value(&value, context()->v8_context());
   }
   args.GetReturnValue().Set(result);
 }
 
 }  // namespace extensions