Revert 184837

chrome/renderer/extensions/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 "chrome/renderer/extensions/app_window_custom_bindings.h"
 
 #include <string>
 
 #include "chrome/common/extensions/extension_messages.h"
 #include "chrome/renderer/extensions/chrome_v8_context.h"
@@ skipping 31 matching lines @@
       return;
     v8::Context::Scope context_scope(v8_context->v8_context());
     v8_context->module_system()->CallModuleMethod(
         "injectAppTitlebar", "didCreateDocumentElement");
   }
 
  private:
   Dispatcher* dispatcher_;
 };
 
-AppWindowCustomBindings::AppWindowCustomBindings(
-    Dispatcher* dispatcher,
-    v8::Handle<v8::Context> context) : ChromeV8Extension(dispatcher, context) {
+AppWindowCustomBindings::AppWindowCustomBindings(Dispatcher* dispatcher)
+    : ChromeV8Extension(dispatcher) {
   RouteFunction("GetView",
       base::Bind(&AppWindowCustomBindings::GetView,
                  base::Unretained(this)));
   RouteFunction("OnContextReady",
       base::Bind(&AppWindowCustomBindings::OnContextReady,
                  base::Unretained(this)));
 }
 
 namespace {
 class LoadWatcher : public content::RenderViewObserver {
@@ skipping 87 matching lines @@
   if (!view)
     return v8::Undefined();
 
   if (inject_titlebar)
     new DidCreateDocumentElementObserver(view, dispatcher());
 
   // 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::RenderView* render_view = GetRenderView();
+  content::RenderView* render_view = GetCurrentRenderView();
   if (!render_view)
     return v8::Undefined();
   WebKit::WebFrame* opener = render_view->GetWebView()->mainFrame();
   WebKit::WebFrame* frame = view->GetWebView()->mainFrame();
   frame->setOpener(opener);
   content::RenderThread::Get()->Send(
       new ExtensionHostMsg_ResumeRequests(view->GetRoutingID()));
 
   v8::Local<v8::Value> window = frame->mainWorldScriptContext()->Global();
   return window;
 }
 
 }  // namespace extensions