Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(14)

Unified Diff: webkit/glue/plugins/plugin_list_linux.cc

Issue 199053: linux: split MOZ_PLUGIN_PATH on colons (Closed)
Patch Set: Created 11 years, 3 months ago
Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.
Jump to:
View side-by-side diff with in-line comments
Download patch
« no previous file with comments | « no previous file | no next file » | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: webkit/glue/plugins/plugin_list_linux.cc
diff --git a/webkit/glue/plugins/plugin_list_linux.cc b/webkit/glue/plugins/plugin_list_linux.cc
index 45ae10344fa312c681445b8895240918861f55cd..41c8c438df67b84bfff5158554def3b91ea0e551 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
« no previous file with comments | « no previous file | no next file » | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698