summaryrefslogtreecommitdiffstats
path: root/webkit
diff options
context:
space:
mode:
authorevan@chromium.org <evan@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98>2009-09-09 01:18:46 +0000
committerevan@chromium.org <evan@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98>2009-09-09 01:18:46 +0000
commit6b0ba48b96ba8e0c2fe999ddfb03a722bfdc692e (patch)
tree038b0070e393a3b9c0eedf7dea2b1bc665fc0208 /webkit
parent22256b750dd5db9c77b91f5a7b36f4074a34d53a (diff)
downloadchromium_src-6b0ba48b96ba8e0c2fe999ddfb03a722bfdc692e.zip
chromium_src-6b0ba48b96ba8e0c2fe999ddfb03a722bfdc692e.tar.gz
chromium_src-6b0ba48b96ba8e0c2fe999ddfb03a722bfdc692e.tar.bz2
linux: split MOZ_PLUGIN_PATH on colons
BUG=20882 Review URL: http://codereview.chromium.org/199053 git-svn-id: svn://svn.chromium.org/chrome/trunk/src@25698 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'webkit')
-rw-r--r--webkit/glue/plugins/plugin_list_linux.cc8
1 files changed, 6 insertions, 2 deletions
diff --git a/webkit/glue/plugins/plugin_list_linux.cc b/webkit/glue/plugins/plugin_list_linux.cc
index 45ae103..41c8c43 100644
--- a/webkit/glue/plugins/plugin_list_linux.cc
+++ b/webkit/glue/plugins/plugin_list_linux.cc
@@ -57,8 +57,12 @@ void PluginList::GetPluginDirectories(std::vector<FilePath>* plugin_dirs) {
// 1) MOZ_PLUGIN_PATH env variable.
const char* moz_plugin_path = getenv("MOZ_PLUGIN_PATH");
- if (moz_plugin_path)
- plugin_dirs->push_back(FilePath(moz_plugin_path));
+ if (moz_plugin_path) {
+ std::vector<std::string> paths;
+ SplitString(moz_plugin_path, ':', &paths);
+ for (size_t i = 0; i < paths.size(); ++i)
+ plugin_dirs->push_back(FilePath(paths[i]));
+ }
// 2) NS_USER_PLUGINS_DIR: ~/.mozilla/plugins.
// This is a de-facto standard, so even though we're not Mozilla, let's