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

Unified Diff: base/process_util_win.cc

Issue 7386002: Rename CommandLine::GetCommandLineString(). (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: Merge. Created 9 years, 5 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 | « base/process_util_unittest.cc ('k') | chrome/app/chrome_main.cc » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: base/process_util_win.cc
diff --git a/base/process_util_win.cc b/base/process_util_win.cc
index 9aa7f4471a9b0f0fec6de806f0a503c70ad6cb55..8a2eafe97813697c59fae740926fde180d764df7 100644
--- a/base/process_util_win.cc
+++ b/base/process_util_win.cc
@@ -271,7 +271,7 @@ bool LaunchProcess(const string16& cmdline,
bool LaunchProcess(const CommandLine& cmdline,
const LaunchOptions& options,
ProcessHandle* process_handle) {
- return LaunchProcess(cmdline.command_line_string(), options, process_handle);
+ return LaunchProcess(cmdline.GetCommandLineString(), options, process_handle);
}
// Attempts to kill the process identified by the given process
@@ -317,7 +317,8 @@ bool GetAppOutput(const CommandLine& cl, std::string* output) {
return false;
}
- // Now create the child process
+ std::wstring writable_command_line_string(cl.GetCommandLineString());
+
PROCESS_INFORMATION proc_info = { 0 };
STARTUPINFO start_info = { 0 };
@@ -330,7 +331,7 @@ bool GetAppOutput(const CommandLine& cl, std::string* output) {
// Create the child process.
if (!CreateProcess(NULL,
- const_cast<wchar_t*>(cl.command_line_string().c_str()),
+ &writable_command_line_string[0],
NULL, NULL,
TRUE, // Handles are inherited.
0, NULL, NULL, &start_info, &proc_info)) {
« no previous file with comments | « base/process_util_unittest.cc ('k') | chrome/app/chrome_main.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698