From b83ff229cfe2c15a6dab2278acf7d328645470a5 Mon Sep 17 00:00:00 2001 From: "pastarmovj@chromium.org" Date: Mon, 24 Jan 2011 17:37:12 +0000 Subject: Refactor the plugin lists handling code. Effects of this refactor: 1. The WebPluginInfo now keep information not only if a plugin is disabled but also the reason for that. It can either be user, policy or both. That way we can restore the right value after policies stop to control the feature. 2. Plugins can be correctly enabled and disabled either as a group or separately. 3. The code is cleaner and PluginGroup is not duplicating information from PluginList but stores all needed information and provides it through cleaner interface. BUG=54681,66505,69374,69148 TEST=Manual for the policy. DefaultPluginUITest.DefaultPluginLoadTest from ui_tests and Plugin* from test_shell_tests. Review URL: http://codereview.chromium.org/5699005 git-svn-id: svn://svn.chromium.org/chrome/trunk/src@72341 0039d316-1c4b-4281-b951-d872f2087c98 --- webkit/support/webkit_support.cc | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'webkit/support') diff --git a/webkit/support/webkit_support.cc b/webkit/support/webkit_support.cc index db23097..195257b 100644 --- a/webkit/support/webkit_support.cc +++ b/webkit/support/webkit_support.cc @@ -253,7 +253,7 @@ WebPlugin* CreateWebPlugin(WebFrame* frame, std::string actual_mime_type; if (!webkit::npapi::PluginList::Singleton()->GetPluginInfo( params.url, params.mimeType.utf8(), kAllowWildcard, &info, - &actual_mime_type) || !info.enabled) { + &actual_mime_type) || !webkit::npapi::IsPluginEnabled(info)) { return NULL; } -- cgit v1.1