| Index: content/browser/plugin_data_remover_impl.cc
|
| diff --git a/content/browser/plugin_data_remover_impl.cc b/content/browser/plugin_data_remover_impl.cc
|
| index f4eab9f809b8a2b9077c5fd1dd5b3da40085c412..7b34c9b17fd5fdd12c03ba2327e23735c2253be5 100644
|
| --- a/content/browser/plugin_data_remover_impl.cc
|
| +++ b/content/browser/plugin_data_remover_impl.cc
|
| @@ -39,22 +39,21 @@ PluginDataRemover* PluginDataRemover::Create(BrowserContext* browser_context) {
|
| }
|
|
|
| // static
|
| -bool PluginDataRemover::IsSupported(webkit::WebPluginInfo* plugin) {
|
| +void PluginDataRemover::GetSupportedPlugins(
|
| + std::vector<webkit::WebPluginInfo>* supported_plugins) {
|
| bool allow_wildcard = false;
|
| std::vector<webkit::WebPluginInfo> plugins;
|
| PluginService::GetInstance()->GetPluginInfoArray(
|
| GURL(), kFlashMimeType, allow_wildcard, &plugins, NULL);
|
| - std::vector<webkit::WebPluginInfo>::iterator plugin_it = plugins.begin();
|
| - if (plugin_it == plugins.end())
|
| - return false;
|
| - scoped_ptr<Version> version(
|
| - webkit::npapi::PluginGroup::CreateVersionFromString(plugin_it->version));
|
| scoped_ptr<Version> min_version(
|
| Version::GetVersionFromString(kMinFlashVersion));
|
| - bool rv = version.get() && min_version->CompareTo(*version) == -1;
|
| - if (rv)
|
| - *plugin = *plugin_it;
|
| - return rv;
|
| + for (std::vector<webkit::WebPluginInfo>::iterator it = plugins.begin();
|
| + it != plugins.end(); ++it) {
|
| + scoped_ptr<Version> version(
|
| + webkit::npapi::PluginGroup::CreateVersionFromString(it->version));
|
| + if (version.get() && min_version->CompareTo(*version) == -1)
|
| + supported_plugins->push_back(*it);
|
| + }
|
| }
|
|
|
| class PluginDataRemoverImpl::Context
|
|
|