diff options
Diffstat (limited to 'chrome/renderer')
| -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 cd0444e..ea6bfa9 100644 --- a/chrome/renderer/render_view.cc +++ b/chrome/renderer/render_view.cc @@ -2698,6 +2698,8 @@ WebPlugin* RenderView::createPlugin(WebFrame* frame, if (!found) return NULL; DCHECK(plugin_setting != CONTENT_SETTING_DEFAULT); + if (!webkit::npapi::IsPluginEnabled(info)) + return NULL; const webkit::npapi::PluginGroup* group = webkit::npapi::PluginList::Singleton()->GetPluginGroup(info); @@ -2716,9 +2718,6 @@ WebPlugin* RenderView::createPlugin(WebFrame* frame, false); } - if (!webkit::npapi::IsPluginEnabled(info)) - return NULL; - ContentSetting host_setting = current_content_settings_.settings[CONTENT_SETTINGS_TYPE_PLUGINS]; |