summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
-rw-r--r--webkit/glue/plugins/plugin_list.cc10
1 files changed, 5 insertions, 5 deletions
diff --git a/webkit/glue/plugins/plugin_list.cc b/webkit/glue/plugins/plugin_list.cc
index 56a59db..125547d 100644
--- a/webkit/glue/plugins/plugin_list.cc
+++ b/webkit/glue/plugins/plugin_list.cc
@@ -159,16 +159,16 @@ void PluginList::LoadPlugins(bool refresh) {
std::vector<FilePath> directories_to_scan;
GetPluginDirectories(&directories_to_scan);
- for (size_t i = 0; i < directories_to_scan.size(); ++i) {
- LoadPluginsFromDir(directories_to_scan[i]);
- }
+ for (size_t i = 0; i < extra_plugin_paths_.size(); ++i)
+ LoadPlugin(extra_plugin_paths_[i]);
for (size_t i = 0; i < extra_plugin_dirs_.size(); ++i) {
LoadPluginsFromDir(extra_plugin_dirs_[i]);
}
- for (size_t i = 0; i < extra_plugin_paths_.size(); ++i)
- LoadPlugin(extra_plugin_paths_[i]);
+ for (size_t i = 0; i < directories_to_scan.size(); ++i) {
+ LoadPluginsFromDir(directories_to_scan[i]);
+ }
LoadInternalPlugins();