Add frameId to MessageSender (extension messaging API)

extensions/renderer/runtime_custom_bindings.cc

 // Copyright 2014 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/runtime_custom_bindings.h"
 
 #include "base/bind.h"
 #include "base/memory/scoped_ptr.h"
 #include "base/values.h"
+#include "content/public/renderer/render_frame.h"
 #include "content/public/renderer/render_view.h"
 #include "content/public/renderer/v8_value_converter.h"
 #include "extensions/common/extension.h"
 #include "extensions/common/extension_messages.h"
 #include "extensions/common/features/feature.h"
 #include "extensions/common/features/feature_provider.h"
 #include "extensions/common/manifest.h"
 #include "extensions/renderer/api_activity_logger.h"
 #include "extensions/renderer/extension_helper.h"
 #include "extensions/renderer/script_context.h"
@@ skipping 19 matching lines @@
   RouteFunction("GetExtensionViews",
                 base::Bind(&RuntimeCustomBindings::GetExtensionViews,
                            base::Unretained(this)));
 }
 
 RuntimeCustomBindings::~RuntimeCustomBindings() {
 }
 
 void RuntimeCustomBindings::OpenChannelToExtension(
     const v8::FunctionCallbackInfo<v8::Value>& args) {
-  // Get the current RenderView so that we can send a routed IPC message from
+  // Get the current RenderFrame so that we can send a routed IPC message from
   // the correct source.
-  content::RenderView* renderview = context()->GetRenderView();
-  if (!renderview)
+  content::RenderFrame* renderframe = context()->GetRenderFrame();
+  if (!renderframe)
     return;
 
   // The Javascript code should validate/fill the arguments.
   CHECK_EQ(args.Length(), 3);
   CHECK(args[0]->IsString() && args[1]->IsString() && args[2]->IsBoolean());
 
   ExtensionMsg_ExternalConnectionInfo info;
 
   // For messaging APIs, hosted apps should be considered a web page so hide
   // its extension ID.
   const Extension* extension = context()->extension();
   if (extension && !extension->is_hosted_app())
     info.source_id = extension->id();
 
   info.target_id = *v8::String::Utf8Value(args[0]->ToString());
   info.source_url = context()->GetURL();
   std::string channel_name = *v8::String::Utf8Value(args[1]->ToString());
   bool include_tls_channel_id =
       args.Length() > 2 ? args[2]->BooleanValue() : false;
   int port_id = -1;
-  renderview->Send(
-      new ExtensionHostMsg_OpenChannelToExtension(renderview->GetRoutingID(),
-                                                  info,
-                                                  channel_name,
-                                                  include_tls_channel_id,
-                                                  &port_id));
+  renderframe->Send(new ExtensionHostMsg_OpenChannelToExtension(
+      renderframe->GetRoutingID(), info, channel_name, include_tls_channel_id,
+      &port_id));
   args.GetReturnValue().Set(static_cast<int32_t>(port_id));
 }
 
 void RuntimeCustomBindings::OpenChannelToNativeApp(
     const v8::FunctionCallbackInfo<v8::Value>& args) {
   // Verify that the extension has permission to use native messaging.
   Feature::Availability availability =
       FeatureProvider::GetPermissionFeatures()
           ->GetFeature("nativeMessaging")
           ->IsAvailableToContext(context()->extension(),
@@ skipping 81 matching lines @@
       v8::Local<v8::Value> window = context->Global();
       DCHECK(!window.IsEmpty());
       v8_views->Set(v8::Integer::New(args.GetIsolate(), v8_index++), window);
     }
   }
 
   args.GetReturnValue().Set(v8_views);
 }
 
 }  // namespace extensions