diff options
| author | bauerb@chromium.org <bauerb@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2010-08-30 17:05:34 +0000 |
|---|---|---|
| committer | bauerb@chromium.org <bauerb@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2010-08-30 17:05:34 +0000 |
| commit | 5e45686bbb4cf67e111bde33d55f936cd133b6a1 (patch) | |
| tree | 471f0827b4c88fd88883f35661c073cf1fc83d2f /chrome/renderer/render_view.cc | |
| parent | 42a614dd5fe677fd2b98e3b7615c6b2cd733f60b (diff) | |
| download | chromium_src-5e45686bbb4cf67e111bde33d55f936cd133b6a1.zip chromium_src-5e45686bbb4cf67e111bde33d55f936cd133b6a1.tar.gz chromium_src-5e45686bbb4cf67e111bde33d55f936cd133b6a1.tar.bz2 | |
Move --block-nonsandboxed-plugins command line switch to preferences.
BUG=53812
TEST=none
Review URL: http://codereview.chromium.org/3217009
git-svn-id: svn://svn.chromium.org/chrome/trunk/src@57872 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'chrome/renderer/render_view.cc')
| -rw-r--r-- | chrome/renderer/render_view.cc | 5 |
1 files changed, 2 insertions, 3 deletions
diff --git a/chrome/renderer/render_view.cc b/chrome/renderer/render_view.cc index 71dd537..5af03eb 100644 --- a/chrome/renderer/render_view.cc +++ b/chrome/renderer/render_view.cc @@ -2364,9 +2364,8 @@ WebPlugin* RenderView::createPlugin(WebFrame* frame, PepperPluginRegistry::GetInstance()->GetModule(info.path); if (pepper_module) return CreatePepperPlugin(frame, params, info.path, pepper_module.get()); - if (CommandLine::ForCurrentProcess()->HasSwitch( - switches::kBlockNonSandboxedPlugins) && - setting != CONTENT_SETTING_ALLOW) { + if (setting != CONTENT_SETTING_ALLOW) { + // If the host is not whitelisted for this plugin, block it. Send(new ViewHostMsg_NonSandboxedPluginBlocked(routing_id_, resource, group->GetGroupName())); |