Bind plugin placeholder directly to v8 instead of over CppBoundClass

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"
@@ skipping 17 matching lines @@
 using content::RenderThread;
 using content::RenderView;
 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::RenderView* render_view,
     blink::WebFrame* frame,
     const blink::WebPluginParams& params,
     const std::string& html_data,
     const string16& title)
     : plugins::PluginPlaceholder(render_view,
                                  frame,
                                  params,
                                  html_data,
                                  GURL(kPluginPlaceholderDataURL)),
       status_(new ChromeViewHostMsg_GetPluginInfo_Status),
       title_(title),
 #if defined(ENABLE_PLUGIN_INSTALLATION)
       placeholder_routing_id_(MSG_ROUTING_NONE),
 #endif
       has_host_(false),
       context_menu_request_id_(0) {
   RenderThread::Get()->AddObserver(this);
+  RegisterCallback("openAboutPlugins");
 }
 
 ChromePluginPlaceholder::~ChromePluginPlaceholder() {
   RenderThread::Get()->RemoveObserver(this);
   if (context_menu_request_id_)
     render_view()->CancelContextMenu(context_menu_request_id_);
 
 #if defined(ENABLE_PLUGIN_INSTALLATION)
   if (placeholder_routing_id_ == MSG_ROUTING_NONE)
     return;
@@ skipping 133 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) {
-  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() {
   SetMessage(l10n_util::GetStringUTF16(IDS_PLUGIN_NOT_FOUND));
 }
 
 void ChromePluginPlaceholder::OnFoundMissingPlugin(
@@ skipping 108 matching lines @@
   hide_item.label = l10n_util::GetStringUTF16(IDS_CONTENT_CONTEXT_PLUGIN_HIDE);
   params.custom_items.push_back(hide_item);
 
   params.x = event.windowX;
   params.y = event.windowY;
 
   context_menu_request_id_ = render_view()->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)));
+void ChromePluginPlaceholder::Observe(const std::string& callback) {
+  DCHECK_EQ("openAboutPlugins", callback);
+  RenderThread::Get()->Send(
+      new ChromeViewHostMsg_OpenAboutPlugins(routing_id()));
 }