| Index: chrome/renderer/plugins/chrome_plugin_placeholder.h
|
| diff --git a/chrome/renderer/plugins/chrome_plugin_placeholder.h b/chrome/renderer/plugins/chrome_plugin_placeholder.h
|
| index 0e8b1e38768aba3f0cb0c84d8e796a3ff07eb967..d33fb6aa75fe93956dbcbc708370e2f229407072 100644
|
| --- a/chrome/renderer/plugins/chrome_plugin_placeholder.h
|
| +++ b/chrome/renderer/plugins/chrome_plugin_placeholder.h
|
| @@ -49,8 +49,9 @@ class ChromePluginPlaceholder : public plugins::PluginPlaceholder,
|
| const string16& title);
|
| virtual ~ChromePluginPlaceholder();
|
|
|
| - // WebViewPlugin::Delegate (via PluginPlaceholder) method
|
| - virtual void BindWebFrame(blink::WebFrame* frame) OVERRIDE;
|
| + // PluginPlaceholder method
|
| + virtual void InstallAdditionalCallbacks(
|
| + v8::Handle<v8::Template> prototype) OVERRIDE;
|
|
|
| // content::RenderViewObserver (via PluginPlaceholder) override:
|
| virtual bool OnMessageReceived(const IPC::Message& message) OVERRIDE;
|
| @@ -67,8 +68,8 @@ class ChromePluginPlaceholder : public plugins::PluginPlaceholder,
|
|
|
| // Javascript callback opens chrome://plugins in a new tab.
|
| // Arguments are required by the caller, but not used.
|
| - void OpenAboutPluginsCallback(const webkit_glue::CppArgumentList& args,
|
| - webkit_glue::CppVariant* result);
|
| + static void OpenAboutPluginsCallback(
|
| + const v8::FunctionCallbackInfo<v8::Value>& args);
|
|
|
| void OnLoadBlockedPlugins(const std::string& identifier);
|
| void OnSetIsPrerendering(bool is_prerendering);
|
|
|