OLD | NEW |
1 // Copyright 2013 The Chromium Authors. All rights reserved. | 1 // Copyright 2013 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 "shell/context.h" | 5 #include "shell/context.h" |
6 | 6 |
7 #include <vector> | 7 #include <vector> |
8 | 8 |
9 #include "base/bind.h" | 9 #include "base/bind.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/lazy_instance.h" | 12 #include "base/lazy_instance.h" |
13 #include "base/macros.h" | 13 #include "base/macros.h" |
14 #include "base/memory/scoped_ptr.h" | 14 #include "base/memory/scoped_ptr.h" |
15 #include "base/memory/scoped_vector.h" | 15 #include "base/memory/scoped_vector.h" |
16 #include "base/strings/string_split.h" | 16 #include "base/strings/string_split.h" |
17 #include "base/strings/string_util.h" | 17 #include "base/strings/string_util.h" |
18 #include "build/build_config.h" | 18 #include "build/build_config.h" |
19 #include "mojo/application_manager/application_loader.h" | |
20 #include "mojo/application_manager/application_manager.h" | |
21 #include "mojo/common/tracing_impl.h" | 19 #include "mojo/common/tracing_impl.h" |
22 #include "mojo/edk/embedder/embedder.h" | 20 #include "mojo/edk/embedder/embedder.h" |
23 #include "mojo/edk/embedder/simple_platform_support.h" | 21 #include "mojo/edk/embedder/simple_platform_support.h" |
24 #include "mojo/public/cpp/application/application_connection.h" | 22 #include "mojo/public/cpp/application/application_connection.h" |
25 #include "mojo/public/cpp/application/application_delegate.h" | 23 #include "mojo/public/cpp/application/application_delegate.h" |
26 #include "mojo/public/cpp/application/application_impl.h" | 24 #include "mojo/public/cpp/application/application_impl.h" |
27 #include "services/tracing/tracing.mojom.h" | 25 #include "services/tracing/tracing.mojom.h" |
| 26 #include "shell/application_manager/application_loader.h" |
| 27 #include "shell/application_manager/application_manager.h" |
28 #include "shell/dynamic_application_loader.h" | 28 #include "shell/dynamic_application_loader.h" |
29 #include "shell/external_application_listener.h" | 29 #include "shell/external_application_listener.h" |
30 #include "shell/in_process_dynamic_service_runner.h" | 30 #include "shell/in_process_dynamic_service_runner.h" |
31 #include "shell/out_of_process_dynamic_service_runner.h" | 31 #include "shell/out_of_process_dynamic_service_runner.h" |
32 #include "shell/switches.h" | 32 #include "shell/switches.h" |
33 #include "url/gurl.h" | 33 #include "url/gurl.h" |
34 | 34 |
35 namespace mojo { | 35 namespace mojo { |
36 namespace shell { | 36 namespace shell { |
37 namespace { | 37 namespace { |
(...skipping 179 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
217 ScopedMessagePipeHandle Context::ConnectToServiceByName( | 217 ScopedMessagePipeHandle Context::ConnectToServiceByName( |
218 const GURL& application_url, | 218 const GURL& application_url, |
219 const std::string& service_name) { | 219 const std::string& service_name) { |
220 app_urls_.insert(application_url); | 220 app_urls_.insert(application_url); |
221 return application_manager_.ConnectToServiceByName(application_url, | 221 return application_manager_.ConnectToServiceByName(application_url, |
222 service_name).Pass(); | 222 service_name).Pass(); |
223 } | 223 } |
224 | 224 |
225 } // namespace shell | 225 } // namespace shell |
226 } // namespace mojo | 226 } // namespace mojo |
OLD | NEW |