| Index: webkit/glue/plugins/plugin_list_win.cc
|
| diff --git a/webkit/glue/plugins/plugin_list_win.cc b/webkit/glue/plugins/plugin_list_win.cc
|
| index 486926251b8cb48774389c3a4d9e8824307a2c25..32b6bbd5dd54da44daddda3abf97213a59bf1ce8 100644
|
| --- a/webkit/glue/plugins/plugin_list_win.cc
|
| +++ b/webkit/glue/plugins/plugin_list_win.cc
|
| @@ -270,9 +270,8 @@ void PluginList::LoadPluginsFromDir(const FilePath &path,
|
| FindClose(find_handle);
|
| }
|
|
|
| -void PluginList::LoadPluginsFromRegistry(
|
| - std::vector<WebPluginInfo>* plugins,
|
| - std::set<FilePath>* visited_plugins) {
|
| +void PluginList::LoadPluginsFromRegistry(std::vector<WebPluginInfo>* plugins,
|
| + std::set<FilePath>* visited_plugins) {
|
| std::set<FilePath> plugin_dirs;
|
|
|
| GetPluginsInRegistryDirectory(
|
| @@ -335,13 +334,13 @@ bool PluginList::ShouldLoadPlugin(const WebPluginInfo& info,
|
|
|
| for (size_t i = 0; i < plugins->size(); ++i) {
|
| std::wstring plugin1 =
|
| - StringToLowerASCII((*plugins)[i].path.BaseName().ToWStringHack());
|
| + StringToLowerASCII(plugins->at(i).path.BaseName().ToWStringHack());
|
| std::wstring plugin2 =
|
| StringToLowerASCII(info.path.BaseName().ToWStringHack());
|
| - if ((plugin1 == plugin2 && HaveSharedMimeType((*plugins)[i], info)) ||
|
| + if ((plugin1 == plugin2 && HaveSharedMimeType(plugins->at(i), info)) ||
|
| (plugin1 == kJavaDeploy1 && plugin2 == kJavaDeploy2) ||
|
| (plugin1 == kJavaDeploy2 && plugin2 == kJavaDeploy1)) {
|
| - if (!IsNewerVersion((*plugins)[i].version, info.version))
|
| + if (!IsNewerVersion(plugins->at(i).version, info.version))
|
| return false; // We have loaded a plugin whose version is newer.
|
|
|
| plugins->erase(plugins->begin() + i);
|
| @@ -392,14 +391,14 @@ bool PluginList::ShouldLoadPlugin(const WebPluginInfo& info,
|
| return false;
|
|
|
| for (size_t i = 0; i < plugins->size(); ++i) {
|
| - if ((*plugins)[i].path.BaseName().value() == kOldWMPPlugin) {
|
| + if (plugins->at(i).path.BaseName().value() == kOldWMPPlugin) {
|
| plugins->erase(plugins->begin() + i);
|
| break;
|
| }
|
| }
|
| } else if (filename == kOldWMPPlugin) {
|
| for (size_t i = 0; i < plugins->size(); ++i) {
|
| - if ((*plugins)[i].path.BaseName().value() == kNewWMPPlugin)
|
| + if (plugins->at(i).path.BaseName().value() == kNewWMPPlugin)
|
| return false;
|
| }
|
| }
|
|
|