summaryrefslogtreecommitdiffstats
path: root/base/process_util.h
diff options
context:
space:
mode:
authorthestig@chromium.org <thestig@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98>2009-07-21 07:00:13 +0000
committerthestig@chromium.org <thestig@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98>2009-07-21 07:00:13 +0000
commit9ec8db0fa5c9e8e449c2552154424535ae20f789 (patch)
treeb3f9dd2bc3f46c10d0657653f97b1cd307b70723 /base/process_util.h
parent685092ab45505a2bb8c138ecd2207dde16305450 (diff)
downloadchromium_src-9ec8db0fa5c9e8e449c2552154424535ae20f789.zip
chromium_src-9ec8db0fa5c9e8e449c2552154424535ae20f789.tar.gz
chromium_src-9ec8db0fa5c9e8e449c2552154424535ae20f789.tar.bz2
Set GTK_PATH to CHROMIUM_SAVED_GTK_PATH before launching xdg-open.
Wrappers that launch Chromium will need to set CHROMIUM_SAVED_GTK_PATH before modifying GTK_PATH. This can be done later in separate CLs. BUG=15565 TEST=see bug Review URL: http://codereview.chromium.org/159112 git-svn-id: svn://svn.chromium.org/chrome/trunk/src@21168 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'base/process_util.h')
-rw-r--r--base/process_util.h12
1 files changed, 11 insertions, 1 deletions
diff --git a/base/process_util.h b/base/process_util.h
index f3e47fd..31d8de7 100644
--- a/base/process_util.h
+++ b/base/process_util.h
@@ -20,6 +20,7 @@
#endif
#include <string>
+#include <utility>
#include <vector>
#include "base/command_line.h"
@@ -141,7 +142,16 @@ typedef std::vector<std::pair<int, int> > file_handle_mapping_vector;
bool LaunchApp(const std::vector<std::string>& argv,
const file_handle_mapping_vector& fds_to_remap,
bool wait, ProcessHandle* process_handle);
-#endif
+#if defined(OS_LINUX)
+// Similar to above, but also (un)set environment variables in child process
+// through |environ|.
+typedef std::vector<std::pair<const char*, const char*> > environment_vector;
+bool LaunchApp(const std::vector<std::string>& argv,
+ const environment_vector& environ,
+ const file_handle_mapping_vector& fds_to_remap,
+ bool wait, ProcessHandle* process_handle);
+#endif // defined(OS_LINUX)
+#endif // defined(OS_POSIX)
// Executes the application specified by cl. This function delegates to one
// of the above two platform-specific functions.