Commit 5be20ecd authored by abarth@chromium.org's avatar abarth@chromium.org

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
parent 06aaac23
......@@ -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();
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment