summaryrefslogtreecommitdiffstats
path: root/chrome/renderer/render_view.h
diff options
context:
space:
mode:
authorbauerb@chromium.org <bauerb@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98>2010-08-05 08:38:09 +0000
committerbauerb@chromium.org <bauerb@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98>2010-08-05 08:38:09 +0000
commitaad51d1cb904c54a0455d5b2a3563e51c4c13abc (patch)
tree4b89866de2a59f64396dc064250f3e97cbf73094 /chrome/renderer/render_view.h
parentcde689e1c1384e9e7500f92a274522272c845b5b (diff)
downloadchromium_src-aad51d1cb904c54a0455d5b2a3563e51c4c13abc.zip
chromium_src-aad51d1cb904c54a0455d5b2a3563e51c4c13abc.tar.gz
chromium_src-aad51d1cb904c54a0455d5b2a3563e51c4c13abc.tar.bz2
Block non-sandboxed plugins.
Run Chrome with --block-nonsandboxed-plugins to enable. BUG=47730 TEST=See bug description for manual test. Review URL: http://codereview.chromium.org/3040034 git-svn-id: svn://svn.chromium.org/chrome/trunk/src@55041 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'chrome/renderer/render_view.h')
-rw-r--r--chrome/renderer/render_view.h19
1 files changed, 14 insertions, 5 deletions
diff --git a/chrome/renderer/render_view.h b/chrome/renderer/render_view.h
index 18f5fe2..1834ba1 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,