summaryrefslogtreecommitdiffstats
path: root/webkit/glue
diff options
context:
space:
mode:
authorevan@chromium.org <evan@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98>2009-07-29 21:09:31 +0000
committerevan@chromium.org <evan@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98>2009-07-29 21:09:31 +0000
commit1202ba9d2a63c05b704150b633fff567bd0c5622 (patch)
tree89c8de4dec538c7cae5a11a7cc2f0946bdebf901 /webkit/glue
parent778da76f8a401af0eb108889e3e29506d1638bd5 (diff)
downloadchromium_src-1202ba9d2a63c05b704150b633fff567bd0c5622.zip
chromium_src-1202ba9d2a63c05b704150b633fff567bd0c5622.tar.gz
chromium_src-1202ba9d2a63c05b704150b633fff567bd0c5622.tar.bz2
linux: also look in ~/.mozilla/plugins for plugins
As a few people pointed out, this is the de-facto standard location for per-user plugin installs. Review URL: http://codereview.chromium.org/160352 git-svn-id: svn://svn.chromium.org/chrome/trunk/src@21993 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'webkit/glue')
-rw-r--r--webkit/glue/plugins/plugin_list_linux.cc8
1 files changed, 7 insertions, 1 deletions
diff --git a/webkit/glue/plugins/plugin_list_linux.cc b/webkit/glue/plugins/plugin_list_linux.cc
index c47b9e9..0d9b577 100644
--- a/webkit/glue/plugins/plugin_list_linux.cc
+++ b/webkit/glue/plugins/plugin_list_linux.cc
@@ -24,7 +24,13 @@ void PluginList::GetPluginDirectories(std::vector<FilePath>* plugin_dirs) {
plugin_dirs->push_back(FilePath(moz_plugin_path));
// 2) NS_USER_PLUGINS_DIR: ~/.mozilla/plugins.
- // TODO(evanm): should we do anything here?
+ // This is a de-facto standard, so even though we're not Mozilla, let's
+ // look in there too.
+ const char* home = getenv("HOME");
+ if (home)
+ plugin_dirs->push_back(FilePath(home).Append(".mozilla/plugins"));
+ // TODO(evanm): maybe consult our own plugins dir, like
+ // ~/.config/chromium/Plugins?
// 3) NS_APP_PLUGINS_DIR: the binary dir + "plugins/".
FilePath dir;