diff options
| author | pastarmovj@chromium.org <pastarmovj@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2011-01-24 17:37:12 +0000 |
|---|---|---|
| committer | pastarmovj@chromium.org <pastarmovj@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2011-01-24 17:37:12 +0000 |
| commit | b83ff229cfe2c15a6dab2278acf7d328645470a5 (patch) | |
| tree | a1b9183bbb3c9aaa91364b5e15c22115336b9786 /chrome/browser/plugin_updater.cc | |
| parent | 77d13338e12da7ac2c177f4da53b9293850ff357 (diff) | |
| download | chromium_src-b83ff229cfe2c15a6dab2278acf7d328645470a5.zip chromium_src-b83ff229cfe2c15a6dab2278acf7d328645470a5.tar.gz chromium_src-b83ff229cfe2c15a6dab2278acf7d328645470a5.tar.bz2 | |
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
Diffstat (limited to 'chrome/browser/plugin_updater.cc')
| -rw-r--r-- | chrome/browser/plugin_updater.cc | 42 |
1 files changed, 26 insertions, 16 deletions
diff --git a/chrome/browser/plugin_updater.cc b/chrome/browser/plugin_updater.cc index d994efd..375bf0a 100644 --- a/chrome/browser/plugin_updater.cc +++ b/chrome/browser/plugin_updater.cc @@ -40,7 +40,7 @@ DictionaryValue* PluginUpdater::CreatePluginFileSummary( data->SetString("path", plugin.path.value()); data->SetString("name", plugin.name); data->SetString("version", plugin.version); - data->SetBoolean("enabled", plugin.enabled); + data->SetBoolean("enabled", webkit::npapi::IsPluginEnabled(plugin)); return data; } @@ -58,17 +58,14 @@ ListValue* PluginUpdater::GetPluginGroupsData() { } void PluginUpdater::EnablePluginGroup(bool enable, const string16& group_name) { - if (webkit::npapi::PluginGroup::IsPluginNameDisabledByPolicy(group_name)) - enable = false; webkit::npapi::PluginList::Singleton()->EnableGroup(enable, group_name); NotifyPluginStatusChanged(); } -void PluginUpdater::EnablePluginFile(bool enable, - const FilePath::StringType& path) { +void PluginUpdater::EnablePlugin(bool enable, + const FilePath::StringType& path) { FilePath file_path(path); - if (enable && - !webkit::npapi::PluginGroup::IsPluginPathDisabledByPolicy(file_path)) + if (enable) webkit::npapi::PluginList::Singleton()->EnablePlugin(file_path); else webkit::npapi::PluginList::Singleton()->DisablePlugin(file_path); @@ -250,9 +247,9 @@ void PluginUpdater::GetPreferencesDataOnFileThread(void* profile) { BrowserThread::PostTask( BrowserThread::UI, FROM_HERE, - NewRunnableFunction( - &PluginUpdater::OnUpdatePreferences, - static_cast<Profile*>(profile), plugins, groups)); + NewRunnableFunction(&PluginUpdater::OnUpdatePreferences, + static_cast<Profile*>(profile), + plugins, groups)); } void PluginUpdater::OnUpdatePreferences( @@ -269,16 +266,29 @@ void PluginUpdater::OnUpdatePreferences( internal_dir); // Add the plugin files. - for (std::vector<webkit::npapi::WebPluginInfo>::const_iterator it = - plugins.begin(); - it != plugins.end(); - ++it) { - plugins_list->Append(CreatePluginFileSummary(*it)); + for (size_t i = 0; i < plugins.size(); ++i) { + DictionaryValue* summary = CreatePluginFileSummary(plugins[i]); + // If the plugin is disabled only by policy don't store this state in the + // user pref store. + if (plugins[i].enabled == + webkit::npapi::WebPluginInfo::USER_ENABLED_POLICY_DISABLED) { + summary->SetBoolean("enabled", true); + } + bool enabled_val; + summary->GetBoolean("enabled", &enabled_val); + plugins_list->Append(summary); } // Add the groups as well. for (size_t i = 0; i < groups.size(); ++i) { - plugins_list->Append(groups[i].GetSummary()); + DictionaryValue* summary = groups[i].GetSummary(); + // If the plugin is disabled only by policy don't store this state in the + // user pref store. + if (!groups[i].Enabled() && + webkit::npapi::PluginGroup::IsPluginNameDisabledByPolicy( + groups[i].GetGroupName())) + summary->SetBoolean("enabled", true); + plugins_list->Append(summary); } } |