| 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 66869207a28f81c431a7ffb40d04b4af6a1ec222..1dac496d0e2df2880724fabd6b237efadb4e4258 100644
|
| --- a/chrome/renderer/plugins/chrome_plugin_placeholder.h
|
| +++ b/chrome/renderer/plugins/chrome_plugin_placeholder.h
|
| @@ -6,13 +6,18 @@
|
| #define CHROME_RENDERER_PLUGINS_CHROME_PLUGIN_PLACEHOLDER_H_
|
|
|
| #include "components/plugins/renderer/plugin_placeholder.h"
|
| +#include "gin/wrappable.h"
|
|
|
| struct ChromeViewHostMsg_GetPluginInfo_Status;
|
|
|
| class ChromePluginPlaceholder : public plugins::PluginPlaceholder,
|
| public content::RenderProcessObserver,
|
| - public content::ContextMenuClient {
|
| + public content::ContextMenuClient,
|
| + public gin::Wrappable<ChromePluginPlaceholder> {
|
| public:
|
| + static gin::WrapperInfo kWrapperInfo;
|
| + static v8::Local<v8::ObjectTemplate> GetObjectTemplate(v8::Isolate* isolate);
|
| +
|
| static const char kPluginPlaceholderDataURL[];
|
|
|
| static ChromePluginPlaceholder* CreateBlockedPlugin(
|
| @@ -66,9 +71,7 @@ class ChromePluginPlaceholder : public plugins::PluginPlaceholder,
|
| virtual void OnMenuClosed(int request_id) OVERRIDE;
|
|
|
| // 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);
|
| + void OpenAboutPluginsCallback();
|
|
|
| void OnLoadBlockedPlugins(const std::string& identifier);
|
| void OnSetIsPrerendering(bool is_prerendering);
|
|
|