diff options
| author | msw@chromium.org <msw@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2011-07-20 04:54:52 +0000 |
|---|---|---|
| committer | msw@chromium.org <msw@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2011-07-20 04:54:52 +0000 |
| commit | 61a4c6f8372350bedd95d8834c8bfd1b36a27c1b (patch) | |
| tree | d2c796ee2336083b018d6a38fc54627b26559498 /base/process_util_win.cc | |
| parent | 480ac51965719719beb1761274491acb6eda95e9 (diff) | |
| download | chromium_src-61a4c6f8372350bedd95d8834c8bfd1b36a27c1b.zip chromium_src-61a4c6f8372350bedd95d8834c8bfd1b36a27c1b.tar.gz chromium_src-61a4c6f8372350bedd95d8834c8bfd1b36a27c1b.tar.bz2 | |
Rename CommandLine::GetCommandLineString().
Fix string hackery in net/tools/dump_cache/dump_cache.cc
Fix const casts in chrome/installer/util/product.cc and base/process_util_win.cc.
BUG=73195
TEST=none
Review URL: http://codereview.chromium.org/7386002
git-svn-id: svn://svn.chromium.org/chrome/trunk/src@93165 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'base/process_util_win.cc')
| -rw-r--r-- | base/process_util_win.cc | 7 |
1 files changed, 4 insertions, 3 deletions
diff --git a/base/process_util_win.cc b/base/process_util_win.cc index 9aa7f44..8a2eafe 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)) { |