diff options
| author | evan@chromium.org <evan@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2009-10-14 19:26:27 +0000 |
|---|---|---|
| committer | evan@chromium.org <evan@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2009-10-14 19:26:27 +0000 |
| commit | 86d7ab8851eab9b35ab8b3210d3b2c163ce8bafd (patch) | |
| tree | fc8b67f3f568e6b4ba5df42e8c418adeec58529f /webkit | |
| parent | fbe88c17f6c84df4eab7ae73c184e3709590f888 (diff) | |
| download | chromium_src-86d7ab8851eab9b35ab8b3210d3b2c163ce8bafd.zip chromium_src-86d7ab8851eab9b35ab8b3210d3b2c163ce8bafd.tar.gz chromium_src-86d7ab8851eab9b35ab8b3210d3b2c163ce8bafd.tar.bz2 | |
Load plugins from /usr/lib64 on 64-bit systems.
BUG=23859
TEST=compiles
Review URL: http://codereview.chromium.org/271068
git-svn-id: svn://svn.chromium.org/chrome/trunk/src@28995 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'webkit')
| -rw-r--r-- | webkit/glue/plugins/plugin_list_linux.cc | 9 |
1 files changed, 9 insertions, 0 deletions
diff --git a/webkit/glue/plugins/plugin_list_linux.cc b/webkit/glue/plugins/plugin_list_linux.cc index d740bc6..cfc3114 100644 --- a/webkit/glue/plugins/plugin_list_linux.cc +++ b/webkit/glue/plugins/plugin_list_linux.cc @@ -8,6 +8,7 @@ #include "base/file_util.h" #include "base/path_service.h" #include "base/string_util.h" +#include "build/build_config.h" namespace { @@ -89,6 +90,14 @@ void PluginList::GetPluginDirectories(std::vector<FilePath>* plugin_dirs) { 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")); + +#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/mozilla/plugins")); + plugin_dirs->push_back(FilePath("/usr/lib64/firefox/plugins")); + plugin_dirs->push_back(FilePath("/usr/lib64/xulrunner-addons/plugins")); +#endif } void PluginList::LoadPluginsFromDir(const FilePath& path, |