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

Side by Side Diff: services/service_manager/runner/host/child_process_base.cc

Issue 2419723002: Move services/shell to services/service_manager (Closed)
Patch Set: rebase Created 4 years, 2 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
OLDNEW
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/service_manager/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"
11 #include "base/memory/ref_counted.h" 11 #include "base/memory/ref_counted.h"
12 #include "base/message_loop/message_loop.h" 12 #include "base/message_loop/message_loop.h"
13 #include "base/single_thread_task_runner.h" 13 #include "base/single_thread_task_runner.h"
14 #include "base/synchronization/waitable_event.h" 14 #include "base/synchronization/waitable_event.h"
15 #include "base/threading/thread.h" 15 #include "base/threading/thread.h"
16 #include "mojo/edk/embedder/embedder.h" 16 #include "mojo/edk/embedder/embedder.h"
17 #include "mojo/edk/embedder/process_delegate.h" 17 #include "mojo/edk/embedder/process_delegate.h"
18 #include "services/shell/runner/common/client_util.h" 18 #include "services/service_manager/runner/common/client_util.h"
19 #include "services/shell/runner/common/switches.h" 19 #include "services/service_manager/runner/common/switches.h"
20 20
21 #if defined(OS_LINUX) 21 #if defined(OS_LINUX)
22 #include "base/rand_util.h" 22 #include "base/rand_util.h"
23 #include "base/sys_info.h" 23 #include "base/sys_info.h"
24 #include "services/shell/runner/host/linux_sandbox.h" 24 #include "services/service_manager/runner/host/linux_sandbox.h"
25 #endif 25 #endif
26 26
27 #if defined(OS_MACOSX) 27 #if defined(OS_MACOSX)
28 #include "services/shell/runner/host/mach_broker.h" 28 #include "services/service_manager/runner/host/mach_broker.h"
29 #endif 29 #endif
30 30
31 namespace shell { 31 namespace shell {
32 32
33 namespace { 33 namespace {
34 34
35 #if defined(OS_LINUX) 35 #if defined(OS_LINUX)
36 std::unique_ptr<LinuxSandbox> InitializeSandbox() { 36 std::unique_ptr<LinuxSandbox> InitializeSandbox() {
37 using sandbox::syscall_broker::BrokerFilePermission; 37 using sandbox::syscall_broker::BrokerFilePermission;
38 // Warm parts of base in the copy of base in the mojo runner. 38 // Warm parts of base in the copy of base in the mojo runner.
(...skipping 80 matching lines...) Expand 10 before | Expand all | Expand 10 after
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(GetServiceRequestFromCommandLine()); 125 callback.Run(GetServiceRequestFromCommandLine());
126 } 126 }
127 127
128 } // namespace shell 128 } // namespace shell
OLDNEW
« no previous file with comments | « services/service_manager/runner/host/child_process_base.h ('k') | services/service_manager/runner/host/child_process_host.h » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698