Use the current frame's URL when initializing the extension framework for a frame.

chrome/renderer/extensions/event_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/event_bindings.h"
 
 #include "base/basictypes.h"
 #include "base/singleton.h"
 #include "chrome/common/render_messages.h"
 #include "chrome/common/url_constants.h"
@@ skipping 202 matching lines @@
   if (!bindings_registered)
     return;
 
   v8::HandleScope handle_scope;
   ContextList& contexts = GetContexts();
   v8::Local<v8::Context> frame_context = frame->mainWorldScriptContext();
   v8::Local<v8::Context> context = v8::Context::GetCurrent();
   DCHECK(!context.IsEmpty());
   DCHECK(bindings_utils::FindContext(context) == contexts.end());
 
-  // Figure out the URL for the toplevel frame.  If the top frame is loading,
-  // use its provisional URL, since we get this notification before commit.
-  WebFrame* main_frame = frame->view()->GetMainFrame();
-  WebKit::WebDataSource* ds = main_frame->provisionalDataSource();
+  // Figure out the frame's URL.  If the frame is loading, use its provisional
+  // URL, since we get this notification before commit.
+  WebKit::WebDataSource* ds = frame->provisionalDataSource();
   if (!ds)
-    ds = main_frame->dataSource();
+    ds = frame->dataSource();
   GURL url = ds->request().url();
   std::string extension_id;
   if (url.SchemeIs(chrome::kExtensionScheme)) {
     extension_id = url.host();
   } else if (!content_script) {
     // This context is a regular non-extension web page.  Ignore it.  We only
     // care about content scripts and extension frames.
     // (Unless we're in unit tests, in which case we don't care what the URL
     // is).
     DCHECK(frame_context == context);
@@ skipping 65 matching lines @@
     // TODO(rafaelw): Consider only doing this check if function_name ==
     // "Event.dispatchJSON".
 #ifdef _DEBUG
     if (!retval.IsEmpty() && !retval->IsUndefined()) {
       std::string error = *v8::String::AsciiValue(retval);
       DCHECK(false) << error;
     }
 #endif
   }
 }