| OLD | NEW |
| 1 // Copyright 2014 The Chromium Authors. All rights reserved. | 1 // Copyright 2014 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 "services/shell/runner/host/child_process_base.h" | 5 #include "services/shell/runner/host/child_process_base.h" |
| 6 | 6 |
| 7 #include "base/command_line.h" | 7 #include "base/command_line.h" |
| 8 #include "base/debug/stack_trace.h" | 8 #include "base/debug/stack_trace.h" |
| 9 #include "base/logging.h" | 9 #include "base/logging.h" |
| 10 #include "base/macros.h" | 10 #include "base/macros.h" |
| (...skipping 104 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 115 #endif | 115 #endif |
| 116 #if defined(OS_LINUX) && !defined(OS_ANDROID) | 116 #if defined(OS_LINUX) && !defined(OS_ANDROID) |
| 117 std::unique_ptr<LinuxSandbox> sandbox; | 117 std::unique_ptr<LinuxSandbox> sandbox; |
| 118 const base::CommandLine& command_line = | 118 const base::CommandLine& command_line = |
| 119 *base::CommandLine::ForCurrentProcess(); | 119 *base::CommandLine::ForCurrentProcess(); |
| 120 if (command_line.HasSwitch(switches::kEnableSandbox)) | 120 if (command_line.HasSwitch(switches::kEnableSandbox)) |
| 121 sandbox = InitializeSandbox(); | 121 sandbox = InitializeSandbox(); |
| 122 #endif | 122 #endif |
| 123 | 123 |
| 124 ScopedAppContext app_context; | 124 ScopedAppContext app_context; |
| 125 callback.Run(GetShellClientRequestFromCommandLine()); | 125 callback.Run(GetServiceRequestFromCommandLine()); |
| 126 } | 126 } |
| 127 | 127 |
| 128 } // namespace shell | 128 } // namespace shell |
| OLD | NEW |