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/runner/child_process.h" | 5 #include "mojo/runner/child_process.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/callback_helpers.h" | 9 #include "base/callback_helpers.h" |
10 #include "base/command_line.h" | 10 #include "base/command_line.h" |
11 #include "base/files/file_path.h" | 11 #include "base/files/file_path.h" |
12 #include "base/location.h" | 12 #include "base/location.h" |
13 #include "base/logging.h" | 13 #include "base/logging.h" |
14 #include "base/macros.h" | 14 #include "base/macros.h" |
15 #include "base/memory/ref_counted.h" | 15 #include "base/memory/ref_counted.h" |
16 #include "base/memory/scoped_ptr.h" | 16 #include "base/memory/scoped_ptr.h" |
17 #include "base/message_loop/message_loop.h" | 17 #include "base/message_loop/message_loop.h" |
18 #include "base/single_thread_task_runner.h" | 18 #include "base/single_thread_task_runner.h" |
19 #include "base/synchronization/waitable_event.h" | 19 #include "base/synchronization/waitable_event.h" |
| 20 #include "base/thread_task_runner_handle.h" |
20 #include "base/threading/thread.h" | 21 #include "base/threading/thread.h" |
21 #include "base/threading/thread_checker.h" | 22 #include "base/threading/thread_checker.h" |
22 #include "mojo/common/message_pump_mojo.h" | 23 #include "mojo/common/message_pump_mojo.h" |
23 #include "mojo/edk/embedder/embedder.h" | 24 #include "mojo/edk/embedder/embedder.h" |
24 #include "mojo/edk/embedder/platform_channel_pair.h" | 25 #include "mojo/edk/embedder/platform_channel_pair.h" |
25 #include "mojo/edk/embedder/process_delegate.h" | 26 #include "mojo/edk/embedder/process_delegate.h" |
26 #include "mojo/edk/embedder/scoped_platform_handle.h" | 27 #include "mojo/edk/embedder/scoped_platform_handle.h" |
27 #include "mojo/edk/embedder/simple_platform_support.h" | 28 #include "mojo/edk/embedder/simple_platform_support.h" |
28 #include "mojo/public/cpp/system/core.h" | 29 #include "mojo/public/cpp/system/core.h" |
29 #include "mojo/runner/child_process.mojom.h" | 30 #include "mojo/runner/child_process.mojom.h" |
(...skipping 157 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
187 | 188 |
188 DCHECK(!app_context->controller()); | 189 DCHECK(!app_context->controller()); |
189 | 190 |
190 scoped_ptr<ChildControllerImpl> impl( | 191 scoped_ptr<ChildControllerImpl> impl( |
191 new ChildControllerImpl(app_context, unblocker)); | 192 new ChildControllerImpl(app_context, unblocker)); |
192 | 193 |
193 ScopedMessagePipeHandle host_message_pipe(embedder::CreateChannel( | 194 ScopedMessagePipeHandle host_message_pipe(embedder::CreateChannel( |
194 platform_channel.Pass(), app_context->io_runner(), | 195 platform_channel.Pass(), app_context->io_runner(), |
195 base::Bind(&ChildControllerImpl::DidCreateChannel, | 196 base::Bind(&ChildControllerImpl::DidCreateChannel, |
196 base::Unretained(impl.get())), | 197 base::Unretained(impl.get())), |
197 base::MessageLoopProxy::current())); | 198 base::ThreadTaskRunnerHandle::Get())); |
198 | 199 |
199 impl->Bind(host_message_pipe.Pass()); | 200 impl->Bind(host_message_pipe.Pass()); |
200 | 201 |
201 app_context->set_controller(impl.Pass()); | 202 app_context->set_controller(impl.Pass()); |
202 } | 203 } |
203 | 204 |
204 void Bind(ScopedMessagePipeHandle handle) { binding_.Bind(handle.Pass()); } | 205 void Bind(ScopedMessagePipeHandle handle) { binding_.Bind(handle.Pass()); } |
205 | 206 |
206 // |ErrorHandler| methods: | 207 // |ErrorHandler| methods: |
207 void OnConnectionError() override { | 208 void OnConnectionError() override { |
(...skipping 91 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
299 // This will block, then run whatever the controller wants. | 300 // This will block, then run whatever the controller wants. |
300 blocker.Block(); | 301 blocker.Block(); |
301 | 302 |
302 app_context.Shutdown(); | 303 app_context.Shutdown(); |
303 | 304 |
304 return 0; | 305 return 0; |
305 } | 306 } |
306 | 307 |
307 } // namespace runner | 308 } // namespace runner |
308 } // namespace mojo | 309 } // namespace mojo |
OLD | NEW |