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_context.h" | 5 #include "content/browser/mojo/mojo_shell_context.h" |
6 | 6 |
7 #include "base/lazy_instance.h" | 7 #include "base/lazy_instance.h" |
8 #include "base/macros.h" | 8 #include "base/macros.h" |
9 #include "base/path_service.h" | 9 #include "base/path_service.h" |
10 #include "base/single_thread_task_runner.h" | 10 #include "base/single_thread_task_runner.h" |
11 #include "base/thread_task_runner_handle.h" | 11 #include "base/thread_task_runner_handle.h" |
12 #include "content/browser/gpu/gpu_process_host.h" | 12 #include "content/browser/gpu/gpu_process_host.h" |
13 #include "content/common/gpu/gpu_process_launch_causes.h" | 13 #include "content/common/gpu/gpu_process_launch_causes.h" |
14 #include "content/common/process_control.mojom.h" | 14 #include "content/common/process_control.mojom.h" |
15 #include "content/public/browser/browser_thread.h" | 15 #include "content/public/browser/browser_thread.h" |
16 #include "content/public/browser/content_browser_client.h" | 16 #include "content/public/browser/content_browser_client.h" |
17 #include "content/public/browser/utility_process_host.h" | 17 #include "content/public/browser/utility_process_host.h" |
18 #include "content/public/browser/utility_process_host_client.h" | 18 #include "content/public/browser/utility_process_host_client.h" |
19 #include "content/public/common/content_client.h" | 19 #include "content/public/common/content_client.h" |
20 #include "content/public/common/service_registry.h" | 20 #include "content/public/common/service_registry.h" |
21 #include "mojo/application/public/cpp/application_delegate.h" | 21 #include "mojo/application/public/cpp/application_delegate.h" |
22 #include "mojo/common/url_type_converters.h" | 22 #include "mojo/common/url_type_converters.h" |
23 #include "mojo/package_manager/package_manager_impl.h" | 23 #include "mojo/package_manager/package_manager_impl.h" |
| 24 #include "mojo/public/cpp/bindings/interface_request.h" |
| 25 #include "mojo/public/cpp/bindings/string.h" |
24 #include "mojo/shell/application_loader.h" | 26 #include "mojo/shell/application_loader.h" |
25 #include "mojo/shell/connect_to_application_params.h" | 27 #include "mojo/shell/connect_to_application_params.h" |
26 #include "mojo/shell/identity.h" | 28 #include "mojo/shell/identity.h" |
27 #include "mojo/shell/static_application_loader.h" | 29 #include "mojo/shell/static_application_loader.h" |
28 #include "third_party/mojo/src/mojo/public/cpp/bindings/interface_request.h" | |
29 #include "third_party/mojo/src/mojo/public/cpp/bindings/string.h" | |
30 | 30 |
31 #if defined(ENABLE_MOJO_MEDIA_IN_BROWSER_PROCESS) || \ | 31 #if defined(ENABLE_MOJO_MEDIA_IN_BROWSER_PROCESS) || \ |
32 defined(ENABLE_MOJO_MEDIA_IN_GPU_PROCESS) | 32 defined(ENABLE_MOJO_MEDIA_IN_GPU_PROCESS) |
33 #include "media/mojo/services/mojo_media_application.h" | 33 #include "media/mojo/services/mojo_media_application.h" |
34 #endif | 34 #endif |
35 | 35 |
36 namespace content { | 36 namespace content { |
37 | 37 |
38 namespace { | 38 namespace { |
39 | 39 |
(...skipping 250 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
290 mojo::shell::GetPermissiveCapabilityFilter())); | 290 mojo::shell::GetPermissiveCapabilityFilter())); |
291 params->SetTarget(mojo::shell::Identity(url, std::string(), filter)); | 291 params->SetTarget(mojo::shell::Identity(url, std::string(), filter)); |
292 params->set_services(request.Pass()); | 292 params->set_services(request.Pass()); |
293 params->set_exposed_services(exposed_services.Pass()); | 293 params->set_exposed_services(exposed_services.Pass()); |
294 params->set_on_application_end(base::Bind(&base::DoNothing)); | 294 params->set_on_application_end(base::Bind(&base::DoNothing)); |
295 params->set_connect_callback(callback); | 295 params->set_connect_callback(callback); |
296 application_manager_->ConnectToApplication(params.Pass()); | 296 application_manager_->ConnectToApplication(params.Pass()); |
297 } | 297 } |
298 | 298 |
299 } // namespace content | 299 } // namespace content |
OLD | NEW |