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 "mojo/shell/child_process_host.h" | 5 #include "mojo/runner/child_process_host.h" |
6 | 6 |
7 #include "base/base_switches.h" | 7 #include "base/base_switches.h" |
8 #include "base/bind.h" | 8 #include "base/bind.h" |
9 #include "base/command_line.h" | 9 #include "base/command_line.h" |
10 #include "base/location.h" | 10 #include "base/location.h" |
11 #include "base/logging.h" | 11 #include "base/logging.h" |
12 #include "base/macros.h" | 12 #include "base/macros.h" |
13 #include "base/message_loop/message_loop.h" | 13 #include "base/message_loop/message_loop.h" |
14 #include "base/process/kill.h" | 14 #include "base/process/kill.h" |
15 #include "base/process/launch.h" | 15 #include "base/process/launch.h" |
16 #include "base/stl_util.h" | 16 #include "base/stl_util.h" |
17 #include "base/strings/string_split.h" | 17 #include "base/strings/string_split.h" |
18 #include "base/task_runner.h" | 18 #include "base/task_runner.h" |
19 #include "base/task_runner_util.h" | 19 #include "base/task_runner_util.h" |
20 #include "mojo/edk/embedder/embedder.h" | 20 #include "mojo/edk/embedder/embedder.h" |
21 #include "mojo/public/cpp/system/core.h" | 21 #include "mojo/public/cpp/system/core.h" |
22 #include "mojo/shell/context.h" | 22 #include "mojo/runner/context.h" |
23 #include "mojo/shell/switches.h" | 23 #include "mojo/runner/switches.h" |
24 #include "mojo/shell/task_runners.h" | 24 #include "mojo/runner/task_runners.h" |
25 #include "ui/gl/gl_switches.h" | 25 #include "ui/gl/gl_switches.h" |
26 | 26 |
27 namespace mojo { | 27 namespace mojo { |
28 namespace shell { | 28 namespace shell { |
29 | 29 |
30 ChildProcessHost::ChildProcessHost(Context* context, const std::string& name) | 30 ChildProcessHost::ChildProcessHost(Context* context, const std::string& name) |
31 : context_(context), name_(name), channel_info_(nullptr) { | 31 : context_(context), name_(name), channel_info_(nullptr) { |
32 platform_channel_ = platform_channel_pair_.PassServerHandle(); | 32 platform_channel_ = platform_channel_pair_.PassServerHandle(); |
33 DCHECK(!name.empty()); | 33 DCHECK(!name.empty()); |
34 CHECK(platform_channel_.is_valid()); | 34 CHECK(platform_channel_.is_valid()); |
(...skipping 119 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
154 | 154 |
155 void ChildProcessHost::DidCreateChannel(embedder::ChannelInfo* channel_info) { | 155 void ChildProcessHost::DidCreateChannel(embedder::ChannelInfo* channel_info) { |
156 DVLOG(2) << "AppChildProcessHost::DidCreateChannel()"; | 156 DVLOG(2) << "AppChildProcessHost::DidCreateChannel()"; |
157 | 157 |
158 CHECK(channel_info); | 158 CHECK(channel_info); |
159 channel_info_ = channel_info; | 159 channel_info_ = channel_info; |
160 } | 160 } |
161 | 161 |
162 } // namespace shell | 162 } // namespace shell |
163 } // namespace mojo | 163 } // namespace mojo |
OLD | NEW |