diff options
author | craig.schlenter@chromium.org <craig.schlenter@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2009-07-24 14:58:08 +0000 |
---|---|---|
committer | craig.schlenter@chromium.org <craig.schlenter@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2009-07-24 14:58:08 +0000 |
commit | b31549ff4aa274a66fa63eb81a78cb25efd3c4e0 (patch) | |
tree | 63e52cbe7a8c3920565748a2e898f04f594c3ac0 /webkit/glue/plugins | |
parent | 789f70c794486cdb8de229e825332a43e20630fe (diff) | |
download | chromium_src-b31549ff4aa274a66fa63eb81a78cb25efd3c4e0.zip chromium_src-b31549ff4aa274a66fa63eb81a78cb25efd3c4e0.tar.gz chromium_src-b31549ff4aa274a66fa63eb81a78cb25efd3c4e0.tar.bz2 |
Skip over Mozilla .xpt files when loading plugins on Linux.
Review URL: http://codereview.chromium.org/155746
git-svn-id: svn://svn.chromium.org/chrome/trunk/src@21528 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'webkit/glue/plugins')
-rw-r--r-- | webkit/glue/plugins/plugin_list_linux.cc | 4 |
1 files changed, 3 insertions, 1 deletions
diff --git a/webkit/glue/plugins/plugin_list_linux.cc b/webkit/glue/plugins/plugin_list_linux.cc index 2dee968..c47b9e9 100644 --- a/webkit/glue/plugins/plugin_list_linux.cc +++ b/webkit/glue/plugins/plugin_list_linux.cc @@ -44,7 +44,9 @@ void PluginList::LoadPluginsFromDir(const FilePath& path) { file_util::FileEnumerator::FILES); for (FilePath path = enumerator.Next(); !path.value().empty(); path = enumerator.Next()) { - LoadPlugin(path); + // Skip over Mozilla .xpt files. + if (!path.MatchesExtension(FILE_PATH_LITERAL(".xpt"))) + LoadPlugin(path); } } |