| 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),
|
|
|