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

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

Issue 149346: Load extension plugins before looking for plugins in other places, e.g.... (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src/
Patch Set: Created 11 years, 5 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 20177)
+++ webkit/glue/plugins/plugin_list.cc (working copy)
@@ -159,16 +159,16 @@
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();
« 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