From 5be20ecdd5b71ecfc80639e5656878bd52a0a0b1 Mon Sep 17 00:00:00 2001 From: "abarth@chromium.org" Date: Wed, 8 Jul 2009 21:02:45 +0000 Subject: Load extension plugins before looking for plugins in other places, e.g. Firefox's plugins directory. This allows extensions to override the user's default plugin for a particular mime type. BUG=15943 TEST=none R=mpcomplete Patch by Collin Jackson Review URL: http://codereview.chromium.org/149346 git-svn-id: svn://svn.chromium.org/chrome/trunk/src@20185 0039d316-1c4b-4281-b951-d872f2087c98 --- webkit/glue/plugins/plugin_list.cc | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) (limited to 'webkit') 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 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(); -- cgit v1.1