OLD | NEW |
1 // Copyright 2015 The Chromium Authors. All rights reserved. | 1 // Copyright 2015 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 "content/browser/mojo/mojo_shell_client_host.h" | 5 #include "content/browser/mojo/mojo_shell_client_host.h" |
6 | 6 |
7 #include <stdint.h> | 7 #include <stdint.h> |
8 #include <utility> | 8 #include <utility> |
9 | 9 |
10 #include "base/macros.h" | 10 #include "base/macros.h" |
11 #include "base/strings/stringprintf.h" | 11 #include "base/strings/stringprintf.h" |
12 #include "base/thread_task_runner_handle.h" | 12 #include "base/thread_task_runner_handle.h" |
13 #include "build/build_config.h" | 13 #include "build/build_config.h" |
14 #include "content/common/mojo/mojo_messages.h" | 14 #include "content/common/mojo/mojo_messages.h" |
15 #include "content/public/browser/browser_thread.h" | 15 #include "content/public/browser/browser_thread.h" |
16 #include "content/public/browser/render_process_host.h" | 16 #include "content/public/browser/render_process_host.h" |
17 #include "content/public/browser/render_process_host_observer.h" | 17 #include "content/public/browser/render_process_host_observer.h" |
18 #include "content/public/common/mojo_shell_connection.h" | 18 #include "content/public/common/mojo_shell_connection.h" |
19 #include "ipc/ipc_sender.h" | 19 #include "ipc/ipc_sender.h" |
20 #include "mojo/application/public/cpp/application_impl.h" | |
21 #include "mojo/application/public/interfaces/application_manager.mojom.h" | |
22 #include "mojo/converters/network/network_type_converters.h" | 20 #include "mojo/converters/network/network_type_converters.h" |
| 21 #include "mojo/shell/public/cpp/application_impl.h" |
| 22 #include "mojo/shell/public/interfaces/application_manager.mojom.h" |
23 #include "third_party/mojo/src/mojo/edk/embedder/embedder.h" | 23 #include "third_party/mojo/src/mojo/edk/embedder/embedder.h" |
24 #include "third_party/mojo/src/mojo/edk/embedder/platform_channel_pair.h" | 24 #include "third_party/mojo/src/mojo/edk/embedder/platform_channel_pair.h" |
25 #include "third_party/mojo/src/mojo/edk/embedder/scoped_platform_handle.h" | 25 #include "third_party/mojo/src/mojo/edk/embedder/scoped_platform_handle.h" |
26 | 26 |
27 namespace content { | 27 namespace content { |
28 namespace { | 28 namespace { |
29 | 29 |
30 const char kMojoShellInstanceURL[] = "mojo_shell_instance_url"; | 30 const char kMojoShellInstanceURL[] = "mojo_shell_instance_url"; |
31 const char kMojoPlatformFile[] = "mojo_platform_file"; | 31 const char kMojoPlatformFile[] = "mojo_platform_file"; |
32 | 32 |
(...skipping 171 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
204 BrowserThread::UI, | 204 BrowserThread::UI, |
205 FROM_HERE, | 205 FROM_HERE, |
206 base::Bind(CallRegisterProcessWithBroker, pid, | 206 base::Bind(CallRegisterProcessWithBroker, pid, |
207 platform_handle_wrapper)); | 207 platform_handle_wrapper)); |
208 } | 208 } |
209 | 209 |
210 return platform_channel_pair.PassClientHandle(); | 210 return platform_channel_pair.PassClientHandle(); |
211 } | 211 } |
212 | 212 |
213 } // namespace content | 213 } // namespace content |
OLD | NEW |