diff options
| author | bauerb@chromium.org <bauerb@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2011-02-24 13:38:10 +0000 |
|---|---|---|
| committer | bauerb@chromium.org <bauerb@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2011-02-24 13:38:10 +0000 |
| commit | 8d91f86660ef21a207a5a966046f82b8b2fede09 (patch) | |
| tree | 8067078fec7f58e1d15836d0d4cc492f7be4d81d /chrome/renderer | |
| parent | 6e4171f7f7329de9688d57d863748ba50a13772c (diff) | |
| download | chromium_src-8d91f86660ef21a207a5a966046f82b8b2fede09.zip chromium_src-8d91f86660ef21a207a5a966046f82b8b2fede09.tar.gz chromium_src-8d91f86660ef21a207a5a966046f82b8b2fede09.tar.bz2 | |
Don't warn about outdated disabled plugins.
BUG=73723
TEST=see bug for manual test
Review URL: http://codereview.chromium.org/6551012
git-svn-id: svn://svn.chromium.org/chrome/trunk/src@75880 0039d316-1c4b-4281-b951-d872f2087c98
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]; |