| Index: webkit/plugins/npapi/plugin_list_mac.mm
|
| diff --git a/webkit/plugins/npapi/plugin_list_mac.mm b/webkit/plugins/npapi/plugin_list_mac.mm
|
| index 361691ac8f4906982146bff91ef114e804acd87f..62c3768abfb35cac01b6188101e4f90054ba85ed 100644
|
| --- a/webkit/plugins/npapi/plugin_list_mac.mm
|
| +++ b/webkit/plugins/npapi/plugin_list_mac.mm
|
| @@ -84,16 +84,14 @@ void PluginList::GetPluginDirectories(std::vector<FilePath>* plugin_dirs) {
|
| }
|
| }
|
|
|
| -void PluginList::LoadPluginsFromDir(const FilePath &path,
|
| - ScopedVector<PluginGroup>* plugin_groups,
|
| - std::set<FilePath>* visited_plugins) {
|
| +void PluginList::GetPluginsInDir(
|
| + const FilePath& path, std::vector<FilePath>* plugins) {
|
| file_util::FileEnumerator enumerator(path,
|
| false, // not recursive
|
| file_util::FileEnumerator::DIRECTORIES);
|
| for (FilePath path = enumerator.Next(); !path.value().empty();
|
| path = enumerator.Next()) {
|
| - LoadPlugin(path, plugin_groups);
|
| - visited_plugins->insert(path);
|
| + plugins->push_back(path);
|
| }
|
| }
|
|
|
|
|