diff options
| author | pastarmovj@chromium.org <pastarmovj@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2011-03-01 13:28:58 +0000 |
|---|---|---|
| committer | pastarmovj@chromium.org <pastarmovj@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2011-03-01 13:28:58 +0000 |
| commit | 24ff43d70bfae58e5b7fe4c607fe255ca1c665dd (patch) | |
| tree | a02df6c3e178747e8b79adceb2a8f3307c7d4155 /content | |
| parent | 3ce02419d4f7b3cd1fc062f87fb63a78072b5483 (diff) | |
| download | chromium_src-24ff43d70bfae58e5b7fe4c607fe255ca1c665dd.zip chromium_src-24ff43d70bfae58e5b7fe4c607fe255ca1c665dd.tar.gz chromium_src-24ff43d70bfae58e5b7fe4c607fe255ca1c665dd.tar.bz2 | |
Added EnabledPlugins policy.
The EnabledPlugins policy is linked to the plugins.plugins_whitelist preference.
Renamed some methods to clarify that policies can both disable and enable plugins.
Updated plugins.html (about:plugins) to display policy-enabled plugins.
Lots of tweaks in PluginGroup and PluginList (webkit/plugins/npapi) to preserve the
user's preference across policy changes. Removing a policy on a plugin restores the
state that the user had configured before.
TODO:
The interaction of "EnabledPlugins" and "DisabledPlugins" when overlapping isn't very well addressed yet. Currently, any plugin matching the "disabled" list will be disabled, regardless of matching or not the "enabled" list.
Small fixes:
Added missing "noPlugins" string to the jstemplate strings for plugins.html.
BUG=55022
TEST=Create a policy enabling a specific plugin and check about:plugins. Also test_shell_test PluginGroupTest.ManagedByPolicy, and unit_tests.
Review URL: http://codereview.chromium.org/6469068
Patch from Joao da Silva <joaodasilva@chromium.org>.
git-svn-id: svn://svn.chromium.org/chrome/trunk/src@76373 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'content')
| -rw-r--r-- | content/browser/plugin_service.cc | 5 |
1 files changed, 3 insertions, 2 deletions
diff --git a/content/browser/plugin_service.cc b/content/browser/plugin_service.cc index f7ca16e..76a2b1c 100644 --- a/content/browser/plugin_service.cc +++ b/content/browser/plugin_service.cc @@ -84,8 +84,9 @@ bool PluginService::enable_chrome_plugins_ = true; void PluginService::InitGlobalInstance(Profile* profile) { DCHECK(BrowserThread::CurrentlyOn(BrowserThread::UI)); - // We first group the plugins and then figure out which groups to disable. - PluginUpdater::GetInstance()->DisablePluginGroupsFromPrefs(profile); + // We first group the plugins and then figure out which groups to + // enable or disable. + PluginUpdater::GetInstance()->UpdatePluginGroupsStateFromPrefs(profile); // Have Chrome plugins write their data to the profile directory. GetInstance()->SetChromePluginDataDir(profile->GetPath()); |