diff options
| author | evan@chromium.org <evan@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2010-01-27 01:20:55 +0000 |
|---|---|---|
| committer | evan@chromium.org <evan@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2010-01-27 01:20:55 +0000 |
| commit | 9c49ff0c7cf23ef7cfb387da70764a047af8f642 (patch) | |
| tree | f19f090afe6e55bcb23609969cbfba3e09bdebcb /webkit | |
| parent | b9ab60e1fe74db384831e3989cfa200ee5dfbc3f (diff) | |
| download | chromium_src-9c49ff0c7cf23ef7cfb387da70764a047af8f642.zip chromium_src-9c49ff0c7cf23ef7cfb387da70764a047af8f642.tar.gz chromium_src-9c49ff0c7cf23ef7cfb387da70764a047af8f642.tar.bz2 | |
linux: also load plugins from ~/.config/google-chrome/Plugins
This matches Mozilla, which uses ~/.mozilla/plugins.
BUG=22261
TEST=watch an strace, see that it hits the appropriate dir when loading plugins
Review URL: http://codereview.chromium.org/553102
git-svn-id: svn://svn.chromium.org/chrome/trunk/src@37201 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'webkit')
| -rw-r--r-- | webkit/glue/plugins/plugin_list_linux.cc | 5 |
1 files changed, 3 insertions, 2 deletions
diff --git a/webkit/glue/plugins/plugin_list_linux.cc b/webkit/glue/plugins/plugin_list_linux.cc index a99fe49..9c29998 100644 --- a/webkit/glue/plugins/plugin_list_linux.cc +++ b/webkit/glue/plugins/plugin_list_linux.cc @@ -56,8 +56,9 @@ void PluginList::GetPluginDirectories(std::vector<FilePath>* plugin_dirs) { // We first consult Chrome-specific dirs, then fall back on the logic // Mozilla uses. - // TODO(evanm): maybe consult our own plugins dir, like - // ~/.config/chromium/Plugins? + // Note: "extra" plugin dirs, including the Plugins subdirectory of + // your Chrome config, are examined before these. See the logic + // related to extra_plugin_dirs in plugin_list.cc. // The Chrome binary dir + "plugins/". FilePath dir; |