Move the plugin placeholder from CppBoundClass to gin::Wrappable

chrome/renderer/plugins/chrome_plugin_placeholder.cc

 // Copyright 2013 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/plugins/chrome_plugin_placeholder.h"
 
 #include "base/strings/utf_string_conversions.h"
 #include "base/values.h"
 #include "chrome/common/prerender_messages.h"
 #include "chrome/common/render_messages.h"
 #include "chrome/renderer/chrome_content_renderer_client.h"
 #include "chrome/renderer/custom_menu_commands.h"
 #include "chrome/renderer/plugins/plugin_uma.h"
 #include "content/public/common/context_menu_params.h"
 #include "content/public/renderer/render_frame.h"
 #include "content/public/renderer/render_thread.h"
+#include "gin/handle.h"
+#include "gin/object_template_builder.h"
 #include "grit/generated_resources.h"
 #include "grit/renderer_resources.h"
 #include "grit/webkit_strings.h"
 #include "third_party/WebKit/public/web/WebDocument.h"
 #include "third_party/WebKit/public/web/WebFrame.h"
 #include "third_party/WebKit/public/web/WebInputEvent.h"
+#include "third_party/WebKit/public/web/WebKit.h"
 #include "third_party/WebKit/public/web/WebScriptSource.h"
 #include "ui/base/l10n/l10n_util.h"
 #include "ui/base/resource/resource_bundle.h"
 #include "ui/base/webui/jstemplate_builder.h"
 
 using content::RenderThread;
 using content::RenderView;
 using content::UserMetricsAction;
 using blink::WebDocument;
 using blink::WebElement;
 using blink::WebFrame;
 using blink::WebMouseEvent;
 using blink::WebNode;
 using blink::WebPlugin;
 using blink::WebPluginContainer;
 using blink::WebPluginParams;
-using webkit_glue::CppArgumentList;
-using webkit_glue::CppVariant;
 
 namespace {
 const plugins::PluginPlaceholder* g_last_active_menu = NULL;
 }  // namespace
 
 const char ChromePluginPlaceholder::kPluginPlaceholderDataURL[] =
     "chrome://pluginplaceholderdata/";
 
 ChromePluginPlaceholder::ChromePluginPlaceholder(
     content::RenderFrame* render_frame,
@@ skipping 160 matching lines @@
   IPC_END_MESSAGE_MAP()
 
   return false;
 }
 
 void ChromePluginPlaceholder::OnLoadBlockedPlugins(
     const std::string& identifier) {
   plugins::PluginPlaceholder::OnLoadBlockedPlugins(identifier);
 }
 
-void ChromePluginPlaceholder::OpenAboutPluginsCallback(
-    const CppArgumentList& args,
-    CppVariant* result) {
+void ChromePluginPlaceholder::OpenAboutPluginsCallback() {
   RenderThread::Get()->Send(
       new ChromeViewHostMsg_OpenAboutPlugins(routing_id()));
 }
 
 void ChromePluginPlaceholder::OnSetIsPrerendering(bool is_prerendering) {
   plugins::PluginPlaceholder::OnSetIsPrerendering(is_prerendering);
 }
 
 #if defined(ENABLE_PLUGIN_INSTALLATION)
 void ChromePluginPlaceholder::OnDidNotFindMissingPlugin() {
@@ skipping 26 matching lines @@
                                         UTF8ToUTF16(error)));
 }
 
 void ChromePluginPlaceholder::OnCancelledDownloadingPlugin() {
   SetMessage(
       l10n_util::GetStringFUTF16(IDS_PLUGIN_DOWNLOAD_CANCELLED, plugin_name_));
 }
 #endif  // defined(ENABLE_PLUGIN_INSTALLATION)
 
 void ChromePluginPlaceholder::PluginListChanged() {
-  if (!GetFrame())
+  if (!GetFrame() || !plugin())

[jochen (gone - plz use gerrit), 2013/12/19 13:28:30]

GetFrame() never returned NULL previously.

However, if we destroyed our old plugin, we can't replace it anymore

     return;
   WebDocument document = GetFrame()->top()->document();
   if (document.isNull())
     return;
 
   ChromeViewHostMsg_GetPluginInfo_Output output;
   std::string mime_type(GetPluginParams().mimeType.utf8());
   render_frame()->Send(
       new ChromeViewHostMsg_GetPluginInfo(routing_id(),
                                           GURL(GetPluginParams().url),
@@ skipping 66 matching lines @@
   params.custom_items.push_back(hide_item);
 
   params.x = event.windowX;
   params.y = event.windowY;
 
   context_menu_request_id_ = render_frame()->ShowContextMenu(this, params);
   g_last_active_menu = this;
 }
 
 void ChromePluginPlaceholder::BindWebFrame(blink::WebFrame* frame) {
-  plugins::PluginPlaceholder::BindWebFrame(frame);
-  BindCallback("openAboutPlugins",
-               base::Bind(&ChromePluginPlaceholder::OpenAboutPluginsCallback,
-                          base::Unretained(this)));
+  v8::Isolate* isolate = blink::mainThreadIsolate();
+  v8::HandleScope handle_scope(isolate);
+  v8::Handle<v8::Context> context = frame->mainWorldScriptContext();
+  DCHECK(!context.IsEmpty());
+
+  v8::Context::Scope context_scope(context);
+  v8::Handle<v8::Object> global = context->Global();
+  global->Set(gin::StringToV8(isolate, "plugin"),
+              gin::CreateHandle(isolate, this).ToV8());
 }
+
+gin::ObjectTemplateBuilder ChromePluginPlaceholder::GetObjectTemplateBuilder(
+    v8::Isolate* isolate) {
+  return PluginPlaceholder::GetObjectTemplateBuilder(isolate).SetMethod(
+      "openAboutPlugins", &ChromePluginPlaceholder::OpenAboutPluginsCallback);
+}