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

Unified Diff: content/browser/child_process_launcher.cc

Issue 22750002: Move AlterEnvironment to base/environment.h, implement on Windows. (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: fix win Created 7 years, 4 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 | « content/browser/child_process_launcher.h ('k') | content/browser/gpu/gpu_process_host.cc » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: content/browser/child_process_launcher.cc
diff --git a/content/browser/child_process_launcher.cc b/content/browser/child_process_launcher.cc
index b5bb3f491f070688914d8f2f8146969509e341db..a7927b3669100cabb04aa72be6cad53abfce7981 100644
--- a/content/browser/child_process_launcher.cc
+++ b/content/browser/child_process_launcher.cc
@@ -74,7 +74,7 @@ class ChildProcessLauncher::Context
int ipcfd,
#elif defined(OS_POSIX)
bool use_zygote,
- const base::EnvironmentVector& environ,
+ const base::EnvironmentMap& environ,
int ipcfd,
#endif
CommandLine* cmd_line,
@@ -186,7 +186,7 @@ class ChildProcessLauncher::Context
int ipcfd,
#elif defined(OS_POSIX)
bool use_zygote,
- const base::EnvironmentVector& env,
+ const base::EnvironmentMap& env,
int ipcfd,
#endif
CommandLine* cmd_line) {
@@ -262,7 +262,7 @@ class ChildProcessLauncher::Context
// Actually launch the app.
base::LaunchOptions options;
- options.environ = &env;
+ options.environ = env;
options.fds_to_remap = &fds_to_map;
#if defined(OS_MACOSX)
@@ -414,7 +414,7 @@ ChildProcessLauncher::ChildProcessLauncher(
SandboxedProcessLauncherDelegate* delegate,
#elif defined(OS_POSIX)
bool use_zygote,
- const base::EnvironmentVector& environ,
+ const base::EnvironmentMap& environ,
int ipcfd,
#endif
CommandLine* cmd_line,
« no previous file with comments | « content/browser/child_process_launcher.h ('k') | content/browser/gpu/gpu_process_host.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698