| Index: components/plugins/renderer/plugin_placeholder.h
|
| diff --git a/components/plugins/renderer/plugin_placeholder.h b/components/plugins/renderer/plugin_placeholder.h
|
| index 2fa6116a921c49a45eee816a4a1163780a01859e..eec349ea53a6e21b73fa37018a42b5503e089687 100644
|
| --- a/components/plugins/renderer/plugin_placeholder.h
|
| +++ b/components/plugins/renderer/plugin_placeholder.h
|
| @@ -11,7 +11,7 @@
|
| #include "content/public/renderer/render_process_observer.h"
|
| #include "content/public/renderer/render_view_observer.h"
|
| #include "third_party/WebKit/public/web/WebPluginParams.h"
|
| -#include "webkit/renderer/cpp_bound_class.h"
|
| +#include "v8/include/v8.h"
|
|
|
| namespace content {
|
| struct WebPluginInfo;
|
| @@ -21,7 +21,6 @@ namespace plugins {
|
| // Placeholders can be used if a plug-in is missing or not available
|
| // (blocked or disabled).
|
| class PluginPlaceholder : public content::RenderViewObserver,
|
| - public webkit_glue::CppBoundClass,
|
| public WebViewPlugin::Delegate {
|
| public:
|
|
|
| @@ -44,6 +43,10 @@ class PluginPlaceholder : public content::RenderViewObserver,
|
|
|
| virtual ~PluginPlaceholder();
|
|
|
| + // Derived classes can override this method to install additional V8
|
| + // properties on the prototype of the window.plugin object.
|
| + virtual void InstallAdditionalCallbacks(v8::Handle<v8::Template> prototype);
|
| +
|
| void OnLoadBlockedPlugins(const std::string& identifier);
|
| void OnSetIsPrerendering(bool is_prerendering);
|
|
|
| @@ -74,19 +77,15 @@ class PluginPlaceholder : public content::RenderViewObserver,
|
| virtual void ShowContextMenu(const blink::WebMouseEvent&) OVERRIDE;
|
|
|
| // Javascript callbacks:
|
| - // All ignore arguments (which are, however, required by caller) and return
|
| - // nothing.
|
|
|
| // Load the blocked plugin by calling LoadPlugin().
|
| - void LoadCallback(const webkit_glue::CppArgumentList& args,
|
| - webkit_glue::CppVariant* result);
|
| + static void LoadCallback(const v8::FunctionCallbackInfo<v8::Value>& args);
|
|
|
| // Hide the blocked plugin by calling HidePlugin().
|
| - void HideCallback(const webkit_glue::CppArgumentList& args,
|
| - webkit_glue::CppVariant* result);
|
| + static void HideCallback(const v8::FunctionCallbackInfo<v8::Value>& args);
|
|
|
| - void DidFinishLoadingCallback(const webkit_glue::CppArgumentList& args,
|
| - webkit_glue::CppVariant* result);
|
| + static void DidFinishLoadingCallback(
|
| + const v8::FunctionCallbackInfo<v8::Value>& args);
|
|
|
| void UpdateMessage();
|
|
|
|
|