diff options
| author | jam@chromium.org <jam@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2009-01-13 20:13:07 +0000 |
|---|---|---|
| committer | jam@chromium.org <jam@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2009-01-13 20:13:07 +0000 |
| commit | 07337247e3fc91cd74ba25e4d75dedaf10d0c5f3 (patch) | |
| tree | 62dbfd060259d0b40c029b220257f1f9b538a4d4 | |
| parent | f68ec367c194cdba7c7f0b96a9ceba678ea35a2f (diff) | |
| download | chromium_src-07337247e3fc91cd74ba25e4d75dedaf10d0c5f3.zip chromium_src-07337247e3fc91cd74ba25e4d75dedaf10d0c5f3.tar.gz chromium_src-07337247e3fc91cd74ba25e4d75dedaf10d0c5f3.tar.bz2 | |
Fix the regression where Gears didn't load.
BUG=6375
Review URL: http://codereview.chromium.org/17393
git-svn-id: svn://svn.chromium.org/chrome/trunk/src@7962 0039d316-1c4b-4281-b951-d872f2087c98
| -rw-r--r-- | webkit/glue/plugins/plugin_list.cc | 12 |
1 files changed, 5 insertions, 7 deletions
diff --git a/webkit/glue/plugins/plugin_list.cc b/webkit/glue/plugins/plugin_list.cc index 5d27871..fea4c30 100644 --- a/webkit/glue/plugins/plugin_list.cc +++ b/webkit/glue/plugins/plugin_list.cc @@ -94,13 +94,6 @@ void PluginList::LoadPlugins(bool refresh) { 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 @@ void PluginList::LoadPlugins(bool refresh) { 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), |