Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(815)

Unified Diff: webkit/plugins/npapi/plugin_list_win.cc

Issue 11419234: Merge 167979 - Remove PluginList::RemovePlugin() and directly remove old plug-ins from plug-in list… (Closed) Base URL: svn://svn.chromium.org/chrome/branches/1271/src/
Patch Set: Created 8 years, 1 month ago
Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.
Jump to:
View side-by-side diff with in-line comments
Download patch
« no previous file with comments | « webkit/plugins/npapi/plugin_list.cc ('k') | no next file » | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: webkit/plugins/npapi/plugin_list_win.cc
===================================================================
--- webkit/plugins/npapi/plugin_list_win.cc (revision 170233)
+++ webkit/plugins/npapi/plugin_list_win.cc (working copy)
@@ -458,7 +458,7 @@
(plugin1 == kJavaDeploy2 && plugin2 == kJavaDeploy1)) {
if (!IsNewerVersion((*plugins)[j].version, info.version))
return false; // We have loaded a plugin whose version is newer.
- PluginList::RemovePlugin((*plugins)[j].path, plugins);
+ plugins->erase(plugins->begin() + j);
break;
}
}
@@ -514,7 +514,7 @@
for (size_t j = 0; j < plugins->size(); ++j) {
if ((*plugins)[j].path.BaseName().value() == kOldWMPPlugin) {
- PluginList::RemovePlugin((*plugins)[j].path, plugins);
+ plugins->erase(plugins->begin() + j);
break;
}
}
« no previous file with comments | « webkit/plugins/npapi/plugin_list.cc ('k') | no next file » | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698