Update To 11.40.268.0

[platform/framework/web/crosswalk.git] / src / extensions / renderer / guest_view / guest_view_internal_custom_bindings.cc

diff --git a/src/extensions/renderer/guest_view/guest_view_internal_custom_bindings.cc b/src/extensions/renderer/guest_view/guest_view_internal_custom_bindings.cc
index 908929a..69f70e8 100644 (file)
--- a/src/extensions/renderer/guest_view/guest_view_internal_custom_bindings.cc
+++ b/src/extensions/renderer/guest_view/guest_view_internal_custom_bindings.cc
@@ -11,7 +11,7 @@
 #include "content/public/renderer/v8_value_converter.h"
 #include "extensions/common/extension.h"
 #include "extensions/common/extension_messages.h"
-#include "extensions/renderer/guest_view/guest_view_container.h"
+#include "extensions/renderer/guest_view/extensions_guest_view_container.h"
 #include "extensions/renderer/script_context.h"
 #include "v8/include/v8.h"
 
@@ -41,11 +41,11 @@ void GuestViewInternalCustomBindings::AttachGuest(
   CHECK(args.Length() < 4 || args[3]->IsFunction());
 
   int element_instance_id = args[0]->Int32Value();
-  // An element instance ID uniquely identifies a GuestViewContainer within
-  // a RenderView.
-  GuestViewContainer* guest_view_container =
-      GuestViewContainer::FromID(context()->GetRenderView()->GetRoutingID(),
-                                 element_instance_id);
+  // An element instance ID uniquely identifies a ExtensionsGuestViewContainer
+  // within a RenderView.
+  ExtensionsGuestViewContainer* guest_view_container =
+      ExtensionsGuestViewContainer::FromID(
+          context()->GetRenderView()->GetRoutingID(), element_instance_id);
 
   // TODO(fsamuel): Should we be reporting an error if the element instance ID
   // is invalid?
@@ -64,13 +64,15 @@ void GuestViewInternalCustomBindings::AttachGuest(
         static_cast<base::DictionaryValue*>(params_as_value.release()));
   }
 
-  guest_view_container->AttachGuest(
-      element_instance_id,
-      guest_instance_id,
-      params.Pass(),
-      args.Length() == 4 ? args[3].As<v8::Function>() :
-          v8::Handle<v8::Function>(),
-      args.GetIsolate());
+  linked_ptr<ExtensionsGuestViewContainer::AttachRequest> request(
+      new ExtensionsGuestViewContainer::AttachRequest(
+          element_instance_id,
+          guest_instance_id,
+          params.Pass(),
+          args.Length() == 4 ? args[3].As<v8::Function>() :
+              v8::Handle<v8::Function>(),
+          args.GetIsolate()));
+  guest_view_container->AttachGuest(request);
 
   args.GetReturnValue().Set(v8::Boolean::New(context()->isolate(), true));
 }