OLD | NEW |
1 // Copyright (c) 2010 The Chromium Authors. All rights reserved. | 1 // Copyright (c) 2010 The Chromium Authors. All rights reserved. |
2 // Use of this source code is governed by a BSD-style license that can be | 2 // Use of this source code is governed by a BSD-style license that can be |
3 // found in the LICENSE file. | 3 // found in the LICENSE file. |
4 | 4 |
5 #include "chrome/service/service_child_process_host.h" | 5 #include "chrome/service/service_child_process_host.h" |
6 | 6 |
7 #include "base/command_line.h" | 7 #include "base/command_line.h" |
8 #include "base/logging.h" | 8 #include "base/logging.h" |
9 #include "base/process_util.h" | 9 #include "base/process_util.h" |
10 #include "chrome/common/chrome_switches.h" | 10 #include "chrome/common/chrome_switches.h" |
(...skipping 18 matching lines...) Expand all Loading... |
29 const FilePath& exposed_dir) { | 29 const FilePath& exposed_dir) { |
30 #if !defined(OS_WIN) | 30 #if !defined(OS_WIN) |
31 // TODO(sanjeevr): Implement for non-Windows OSes. | 31 // TODO(sanjeevr): Implement for non-Windows OSes. |
32 NOTIMPLEMENTED(); | 32 NOTIMPLEMENTED(); |
33 return false; | 33 return false; |
34 #else // !defined(OS_WIN) | 34 #else // !defined(OS_WIN) |
35 | 35 |
36 if (no_sandbox) { | 36 if (no_sandbox) { |
37 base::ProcessHandle process = base::kNullProcessHandle; | 37 base::ProcessHandle process = base::kNullProcessHandle; |
38 cmd_line->AppendSwitch(switches::kNoSandbox); | 38 cmd_line->AppendSwitch(switches::kNoSandbox); |
39 base::LaunchApp(*cmd_line, false, false, &process); | 39 base::LaunchOptions options; |
| 40 options.process_handle = &process; |
| 41 base::LaunchProcess(*cmd_line, options); |
40 set_handle(process); | 42 set_handle(process); |
41 } else { | 43 } else { |
42 set_handle(sandbox::StartProcessWithAccess(cmd_line, exposed_dir)); | 44 set_handle(sandbox::StartProcessWithAccess(cmd_line, exposed_dir)); |
43 } | 45 } |
44 return (handle() != base::kNullProcessHandle); | 46 return (handle() != base::kNullProcessHandle); |
45 #endif // !defined(OS_WIN) | 47 #endif // !defined(OS_WIN) |
46 } | 48 } |
OLD | NEW |