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

Side by Side Diff: chrome/service/service_child_process_host.cc

Issue 7377010: This change will split the result codes between content and chrome. (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: actually rename the files 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 unified diff | Download patch | Annotate | Revision Log
OLDNEW
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"
11 #include "content/common/result_codes.h" 11 #include "content/common/result_codes.h"
12 12
13 #if defined(OS_WIN) 13 #if defined(OS_WIN)
14 #include "base/file_path.h" 14 #include "base/file_path.h"
15 #include "content/common/sandbox_policy.h" 15 #include "content/common/sandbox_policy.h"
16 #endif // defined(OS_WIN) 16 #endif // defined(OS_WIN)
17 17
18 ServiceChildProcessHost::ServiceChildProcessHost(ProcessType type) 18 ServiceChildProcessHost::ServiceChildProcessHost(ProcessType type)
19 : ChildProcessInfo(type, -1) { 19 : ChildProcessInfo(type, -1) {
20 } 20 }
21 21
22 ServiceChildProcessHost::~ServiceChildProcessHost() { 22 ServiceChildProcessHost::~ServiceChildProcessHost() {
23 // We need to kill the child process when the host dies. 23 // We need to kill the child process when the host dies.
24 base::KillProcess(handle(), ResultCodes::NORMAL_EXIT, false); 24 base::KillProcess(handle(), content::RESULT_CODE_NORMAL_EXIT, false);
25 } 25 }
26 26
27 bool ServiceChildProcessHost::Launch(CommandLine* cmd_line, 27 bool ServiceChildProcessHost::Launch(CommandLine* cmd_line,
28 bool no_sandbox, 28 bool no_sandbox,
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::LaunchApp(*cmd_line, false, false, &process);
40 set_handle(process); 40 set_handle(process);
41 } else { 41 } else {
42 set_handle(sandbox::StartProcessWithAccess(cmd_line, exposed_dir)); 42 set_handle(sandbox::StartProcessWithAccess(cmd_line, exposed_dir));
43 } 43 }
44 return (handle() != base::kNullProcessHandle); 44 return (handle() != base::kNullProcessHandle);
45 #endif // !defined(OS_WIN) 45 #endif // !defined(OS_WIN)
46 } 46 }
OLDNEW

Powered by Google App Engine
This is Rietveld 408576698