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 <utility> | 7 #include <utility> |
8 | 8 |
9 #include "base/bind.h" | 9 #include "base/bind.h" |
10 #include "base/command_line.h" | 10 #include "base/command_line.h" |
(...skipping 17 matching lines...) Expand all Loading... |
28 #include "content/public/browser/utility_process_host.h" | 28 #include "content/public/browser/utility_process_host.h" |
29 #include "content/public/browser/utility_process_host_client.h" | 29 #include "content/public/browser/utility_process_host_client.h" |
30 #include "content/public/common/content_client.h" | 30 #include "content/public/common/content_client.h" |
31 #include "content/public/common/content_switches.h" | 31 #include "content/public/common/content_switches.h" |
32 #include "content/public/common/service_registry.h" | 32 #include "content/public/common/service_registry.h" |
33 #include "mojo/public/cpp/bindings/interface_request.h" | 33 #include "mojo/public/cpp/bindings/interface_request.h" |
34 #include "mojo/public/cpp/bindings/string.h" | 34 #include "mojo/public/cpp/bindings/string.h" |
35 #include "mojo/services/catalog/factory.h" | 35 #include "mojo/services/catalog/factory.h" |
36 #include "mojo/services/catalog/manifest_provider.h" | 36 #include "mojo/services/catalog/manifest_provider.h" |
37 #include "mojo/services/catalog/store.h" | 37 #include "mojo/services/catalog/store.h" |
38 #include "mojo/shell/connect_params.h" | 38 #include "services/shell/connect_params.h" |
39 #include "mojo/shell/loader.h" | 39 #include "services/shell/loader.h" |
40 #include "mojo/shell/native_runner.h" | 40 #include "services/shell/native_runner.h" |
41 #include "mojo/shell/public/cpp/identity.h" | 41 #include "services/shell/public/cpp/identity.h" |
42 #include "mojo/shell/public/cpp/shell_client.h" | 42 #include "services/shell/public/cpp/shell_client.h" |
43 #include "mojo/shell/public/interfaces/connector.mojom.h" | 43 #include "services/shell/public/interfaces/connector.mojom.h" |
44 #include "mojo/shell/runner/host/in_process_native_runner.h" | 44 #include "services/shell/runner/host/in_process_native_runner.h" |
45 | 45 |
46 namespace content { | 46 namespace content { |
47 | 47 |
48 namespace { | 48 namespace { |
49 | 49 |
50 // An extra set of apps to register on initialization, if set by a test. | 50 // An extra set of apps to register on initialization, if set by a test. |
51 const MojoShellContext::StaticApplicationMap* g_applications_for_test; | 51 const MojoShellContext::StaticApplicationMap* g_applications_for_test; |
52 | 52 |
53 void StartUtilityProcessOnIOThread( | 53 void StartUtilityProcessOnIOThread( |
54 mojo::InterfaceRequest<mojom::ProcessControl> request, | 54 mojo::InterfaceRequest<mojom::ProcessControl> request, |
(...skipping 291 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
346 mojo::Identity source_id(requestor_name, user_id); | 346 mojo::Identity source_id(requestor_name, user_id); |
347 params->set_source(source_id); | 347 params->set_source(source_id); |
348 params->set_target(mojo::Identity(name, user_id)); | 348 params->set_target(mojo::Identity(name, user_id)); |
349 params->set_remote_interfaces(std::move(request)); | 349 params->set_remote_interfaces(std::move(request)); |
350 params->set_local_interfaces(std::move(exposed_services)); | 350 params->set_local_interfaces(std::move(exposed_services)); |
351 params->set_connect_callback(callback); | 351 params->set_connect_callback(callback); |
352 shell_->Connect(std::move(params)); | 352 shell_->Connect(std::move(params)); |
353 } | 353 } |
354 | 354 |
355 } // namespace content | 355 } // namespace content |
OLD | NEW |