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

Unified Diff: webkit/glue/plugins/plugin_list.cc

Issue 17393: Fix the regression where Gears didn't load. (Closed) Base URL: svn://chrome-svn/chrome/trunk/src/
Patch Set: Created 11 years, 11 months 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 | « no previous file | no next file » | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: webkit/glue/plugins/plugin_list.cc
===================================================================
--- webkit/glue/plugins/plugin_list.cc (revision 7907)
+++ webkit/glue/plugins/plugin_list.cc (working copy)
@@ -94,13 +94,6 @@
std::set<FilePath> directories_to_scan;
-
- // Load any plugins listed in the registry
- if (extra_plugin_paths_) {
- for (size_t i = 0; i < extra_plugin_paths_->size(); ++i)
- directories_to_scan.insert((*extra_plugin_paths_)[i].DirName());
- }
-
// Load from the application-specific area
GetAppDirectory(&directories_to_scan);
@@ -125,6 +118,11 @@
LoadPluginsFromDir(*iter);
}
+ if (extra_plugin_paths_) {
+ for (size_t i = 0; i < extra_plugin_paths_->size(); ++i)
+ LoadPlugin((*extra_plugin_paths_)[i]);
+ }
+
if (webkit_glue::IsDefaultPluginEnabled()) {
WebPluginInfo info;
if (PluginLib::ReadWebPluginInfo(FilePath(kDefaultPluginLibraryName),
« no previous file with comments | « no previous file | no next file » | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698