| 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 d5fb2f9406d7554c85c870c47492d3e6fc42ce78..e54c303b3bc7ebc19045b9190b6ccb82e72baa87 100644
|
| --- a/chrome/renderer/plugins/chrome_plugin_placeholder.h
|
| +++ b/chrome/renderer/plugins/chrome_plugin_placeholder.h
|
| @@ -32,7 +32,7 @@ class ChromePluginPlaceholder : public plugins::LoadablePluginPlaceholder,
|
| public content::RenderProcessObserver,
|
| public content::ContextMenuClient {
|
| public:
|
| - static const char kPluginPlaceholderDataURL[];
|
| + static gin::WrapperInfo kWrapperInfo;
|
|
|
| static ChromePluginPlaceholder* CreateBlockedPlugin(
|
| content::RenderFrame* render_frame,
|
| @@ -46,21 +46,20 @@ class ChromePluginPlaceholder : public plugins::LoadablePluginPlaceholder,
|
| const PlaceholderPosterInfo& poster_info);
|
|
|
| // Creates a new WebViewPlugin with a MissingPlugin as a delegate.
|
| - static ChromePluginPlaceholder* CreateMissingPlugin(
|
| + static ChromePluginPlaceholder* CreateLoadableMissingPlugin(
|
| content::RenderFrame* render_frame,
|
| blink::WebLocalFrame* frame,
|
| const blink::WebPluginParams& params);
|
|
|
| - static ChromePluginPlaceholder* CreateErrorPlugin(
|
| - content::RenderFrame* render_frame,
|
| - const base::FilePath& plugin_path);
|
| -
|
| void SetStatus(ChromeViewHostMsg_GetPluginInfo_Status status);
|
|
|
| #if defined(ENABLE_PLUGIN_INSTALLATION)
|
| int32 CreateRoutingId();
|
| #endif
|
|
|
| + // gin::Wrappable (via PluginPlaceholder) method
|
| + gin::WrapperInfo* GetWrapperInfo() override;
|
| +
|
| private:
|
| ChromePluginPlaceholder(content::RenderFrame* render_frame,
|
| blink::WebLocalFrame* frame,
|
|
|