diff options
| author | nsylvain@chromium.org <nsylvain@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2010-09-07 05:15:21 +0000 |
|---|---|---|
| committer | nsylvain@chromium.org <nsylvain@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2010-09-07 05:15:21 +0000 |
| commit | d54636e5c569acc5acc618b0ea10b2a565514c75 (patch) | |
| tree | 830f6036ec2d1f1a371a74f41c56d37ef1a3c64e /base/process_util_win.cc | |
| parent | 2ccb70ec0356cb9257ce62958e37ec19c1b7c32c (diff) | |
| download | chromium_src-d54636e5c569acc5acc618b0ea10b2a565514c75.zip chromium_src-d54636e5c569acc5acc618b0ea10b2a565514c75.tar.gz chromium_src-d54636e5c569acc5acc618b0ea10b2a565514c75.tar.bz2 | |
Revert 58639 -
This seems to have caused some ui_tests to fail (AllowCookies, BlockCookies)
Original comment:
Write the outcome of the Toast Experiment for system-level installs to the right registry key.
BUG=44378
TEST=None
Review URL: http://codereview.chromium.org/3308003
TBR=finnur@chromium.org
Review URL: http://codereview.chromium.org/3369002
git-svn-id: svn://svn.chromium.org/chrome/trunk/src@58667 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'base/process_util_win.cc')
| -rw-r--r-- | base/process_util_win.cc | 29 |
1 files changed, 8 insertions, 21 deletions
diff --git a/base/process_util_win.cc b/base/process_util_win.cc index 044960e..fb7bdb8 100644 --- a/base/process_util_win.cc +++ b/base/process_util_win.cc @@ -191,9 +191,8 @@ bool GetProcessIntegrityLevel(ProcessHandle process, IntegrityLevel *level) { return true; } -bool LaunchAppImpl(const std::wstring& cmdline, - bool wait, bool start_hidden, bool inherit_handles, - ProcessHandle* process_handle) { +bool LaunchApp(const std::wstring& cmdline, + bool wait, bool start_hidden, ProcessHandle* process_handle) { STARTUPINFO startup_info = {0}; startup_info.cb = sizeof(startup_info); startup_info.dwFlags = STARTF_USESHOWWINDOW; @@ -201,7 +200,7 @@ bool LaunchAppImpl(const std::wstring& cmdline, PROCESS_INFORMATION process_info; if (!CreateProcess(NULL, const_cast<wchar_t*>(cmdline.c_str()), NULL, NULL, - inherit_handles, 0, NULL, NULL, + FALSE, 0, NULL, NULL, &startup_info, &process_info)) return false; @@ -220,26 +219,14 @@ bool LaunchAppImpl(const std::wstring& cmdline, return true; } -bool LaunchApp(const std::wstring& cmdline, - bool wait, bool start_hidden, ProcessHandle* process_handle) { - return LaunchAppImpl(cmdline, wait, start_hidden, false, process_handle); -} - -bool LaunchAppWithHandleInheritance( - const std::wstring& cmdline, bool wait, bool start_hidden, - ProcessHandle* process_handle) { - return LaunchAppImpl(cmdline, wait, start_hidden, true, process_handle); -} - bool LaunchAppAsUser(UserTokenHandle token, const std::wstring& cmdline, bool start_hidden, ProcessHandle* process_handle) { - return LaunchAppAsUser(token, cmdline, start_hidden, process_handle, - false, false); + return LaunchAppAsUser(token, cmdline, start_hidden, process_handle, false); } bool LaunchAppAsUser(UserTokenHandle token, const std::wstring& cmdline, bool start_hidden, ProcessHandle* process_handle, - bool empty_desktop_name, bool inherit_handles) { + bool empty_desktop_name) { STARTUPINFO startup_info = {0}; startup_info.cb = sizeof(startup_info); if (empty_desktop_name) @@ -257,7 +244,7 @@ bool LaunchAppAsUser(UserTokenHandle token, const std::wstring& cmdline, BOOL launched = CreateProcessAsUser(token, NULL, const_cast<wchar_t*>(cmdline.c_str()), - NULL, NULL, inherit_handles, flags, enviroment_block, + NULL, NULL, FALSE, flags, enviroment_block, NULL, &startup_info, &process_info); DestroyEnvironmentBlock(enviroment_block); @@ -277,8 +264,8 @@ bool LaunchAppAsUser(UserTokenHandle token, const std::wstring& cmdline, bool LaunchApp(const CommandLine& cl, bool wait, bool start_hidden, ProcessHandle* process_handle) { - return LaunchAppImpl(cl.command_line_string(), wait, - false, start_hidden, process_handle); + return LaunchApp(cl.command_line_string(), wait, + start_hidden, process_handle); } // Attempts to kill the process identified by the given process |