summaryrefslogtreecommitdiffstats
path: root/webkit
diff options
context:
space:
mode:
authorevan@chromium.org <evan@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98>2009-12-28 20:23:29 +0000
committerevan@chromium.org <evan@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98>2009-12-28 20:23:29 +0000
commit1aa74be036b0319e55a2668f30f74cdfe8b4c8b7 (patch)
treee4bb49dd9e25fbe873de97650c1f496e1aeb434f /webkit
parent34ee48ff838834c4986ae4ad439616e74d06e6f9 (diff)
downloadchromium_src-1aa74be036b0319e55a2668f30f74cdfe8b4c8b7.zip
chromium_src-1aa74be036b0319e55a2668f30f74cdfe8b4c8b7.tar.gz
chromium_src-1aa74be036b0319e55a2668f30f74cdfe8b4c8b7.tar.bz2
linux: add another path to plugin search path list
I've seen users reporting they need this on openSUSE and there's a patch in the ALT Linux repo for it as well. Review URL: http://codereview.chromium.org/524002 git-svn-id: svn://svn.chromium.org/chrome/trunk/src@35304 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'webkit')
-rw-r--r--webkit/glue/plugins/plugin_list_linux.cc4
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 cfc3114..a99fe49 100644
--- a/webkit/glue/plugins/plugin_list_linux.cc
+++ b/webkit/glue/plugins/plugin_list_linux.cc
@@ -86,7 +86,8 @@ void PluginList::GetPluginDirectories(std::vector<FilePath>* plugin_dirs) {
plugin_dirs->push_back(FilePath(home).Append(".mozilla/plugins"));
// 3) NS_SYSTEM_PLUGINS_DIR:
- // This varies across different versions of Firefox, so check 'em all.
+ // This varies across different browsers and versions, so check 'em all.
+ plugin_dirs->push_back(FilePath("/usr/lib/browser-plugins"));
plugin_dirs->push_back(FilePath("/usr/lib/mozilla/plugins"));
plugin_dirs->push_back(FilePath("/usr/lib/firefox/plugins"));
plugin_dirs->push_back(FilePath("/usr/lib/xulrunner-addons/plugins"));
@@ -94,6 +95,7 @@ void PluginList::GetPluginDirectories(std::vector<FilePath>* plugin_dirs) {
#if defined(ARCH_CPU_64_BITS)
// On my Ubuntu system, /usr/lib64 is a symlink to /usr/lib.
// But a user reported on their Fedora system they are separate.
+ plugin_dirs->push_back(FilePath("/usr/lib64/browser-plugins"));
plugin_dirs->push_back(FilePath("/usr/lib64/mozilla/plugins"));
plugin_dirs->push_back(FilePath("/usr/lib64/firefox/plugins"));
plugin_dirs->push_back(FilePath("/usr/lib64/xulrunner-addons/plugins"));