| Index: chrome/renderer/render_view.h
|
| diff --git a/chrome/renderer/render_view.h b/chrome/renderer/render_view.h
|
| index 18f5fe2ed58b2e87f5c9e7b2d76def0a1b276d46..1834ba1680fe73ddaf20acf257a51afcbe55f837 100644
|
| --- a/chrome/renderer/render_view.h
|
| +++ b/chrome/renderer/render_view.h
|
| @@ -275,11 +275,8 @@ class RenderView : public RenderWidget,
|
| void OnPepperPluginDestroy(WebPluginDelegatePepper* pepper_plugin);
|
|
|
| // Create a new plugin without checking the content settings.
|
| - WebKit::WebPlugin* CreatePluginInternal(
|
| - WebKit::WebFrame* frame,
|
| - const WebKit::WebPluginParams& params,
|
| - WebPluginInfo* plugin_info,
|
| - const std::string& mime_type);
|
| + WebKit::WebPlugin* CreatePluginNoCheck(WebKit::WebFrame* frame,
|
| + const WebKit::WebPluginParams& params);
|
|
|
| // Asks the browser for the CPBrowsingContext associated with this renderer.
|
| // This is an opaque identifier associated with the renderer for sending
|
| @@ -856,6 +853,18 @@ class RenderView : public RenderWidget,
|
| // UI that is going to be hosted by this RenderView.
|
| void CreateDevToolsClient();
|
|
|
| + // Create a new NPAPI plugin.
|
| + WebKit::WebPlugin* CreateNPAPIPlugin(WebKit::WebFrame* frame,
|
| + const WebKit::WebPluginParams& params,
|
| + const FilePath& path,
|
| + const std::string& mime_type);
|
| +
|
| + // Create a new Pepper plugin.
|
| + WebKit::WebPlugin* CreatePepperPlugin(WebKit::WebFrame* frame,
|
| + const WebKit::WebPluginParams& params,
|
| + const FilePath& path,
|
| + pepper::PluginModule* pepper_module);
|
| +
|
| // Create a new placeholder for a blocked plugin.
|
| WebKit::WebPlugin* CreatePluginPlaceholder(
|
| WebKit::WebFrame* frame,
|
|
|