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 "mojo/shell/context.h" | 5 #include "mojo/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 "build/build_config.h" | 17 #include "build/build_config.h" |
18 #include "mojo/application_manager/application_loader.h" | 18 #include "mojo/application_manager/application_loader.h" |
19 #include "mojo/application_manager/application_manager.h" | 19 #include "mojo/application_manager/application_manager.h" |
20 #include "mojo/application_manager/background_shell_application_loader.h" | 20 #include "mojo/application_manager/background_shell_application_loader.h" |
| 21 #include "mojo/common/tracing_impl.h" |
21 #include "mojo/edk/embedder/embedder.h" | 22 #include "mojo/edk/embedder/embedder.h" |
22 #include "mojo/edk/embedder/simple_platform_support.h" | 23 #include "mojo/edk/embedder/simple_platform_support.h" |
23 #include "mojo/public/cpp/application/application_connection.h" | 24 #include "mojo/public/cpp/application/application_connection.h" |
24 #include "mojo/public/cpp/application/application_delegate.h" | 25 #include "mojo/public/cpp/application/application_delegate.h" |
25 #include "mojo/public/cpp/application/application_impl.h" | 26 #include "mojo/public/cpp/application/application_impl.h" |
26 #include "mojo/shell/dynamic_application_loader.h" | 27 #include "mojo/shell/dynamic_application_loader.h" |
27 #include "mojo/shell/external_application_listener.h" | 28 #include "mojo/shell/external_application_listener.h" |
28 #include "mojo/shell/in_process_dynamic_service_runner.h" | 29 #include "mojo/shell/in_process_dynamic_service_runner.h" |
29 #include "mojo/shell/out_of_process_dynamic_service_runner.h" | 30 #include "mojo/shell/out_of_process_dynamic_service_runner.h" |
30 #include "mojo/shell/switches.h" | 31 #include "mojo/shell/switches.h" |
31 #include "mojo/shell/ui_application_loader_android.h" | 32 #include "mojo/shell/ui_application_loader_android.h" |
32 #include "mojo/spy/spy.h" | 33 #include "mojo/spy/spy.h" |
| 34 #include "services/tracing/tracing.mojom.h" |
| 35 #include "url/gurl.h" |
33 | 36 |
34 #if defined(OS_ANDROID) | 37 #if defined(OS_ANDROID) |
35 #include "mojo/services/gles2/gpu_impl.h" | 38 #include "mojo/services/gles2/gpu_impl.h" |
36 #include "mojo/services/native_viewport/native_viewport_impl.h" | 39 #include "mojo/services/native_viewport/native_viewport_impl.h" |
37 #include "mojo/shell/android/android_handler_loader.h" | 40 #include "mojo/shell/android/android_handler_loader.h" |
38 #include "mojo/shell/network_application_loader.h" | 41 #include "mojo/shell/network_application_loader.h" |
39 #endif // defined(OS_ANDROID) | 42 #endif // defined(OS_ANDROID) |
40 | 43 |
41 namespace mojo { | 44 namespace mojo { |
42 namespace shell { | 45 namespace shell { |
(...skipping 221 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
264 { | 267 { |
265 scoped_ptr<BackgroundShellApplicationLoader> loader( | 268 scoped_ptr<BackgroundShellApplicationLoader> loader( |
266 new BackgroundShellApplicationLoader( | 269 new BackgroundShellApplicationLoader( |
267 scoped_ptr<ApplicationLoader>(new AndroidHandlerLoader()), | 270 scoped_ptr<ApplicationLoader>(new AndroidHandlerLoader()), |
268 "android_handler", base::MessageLoop::TYPE_DEFAULT)); | 271 "android_handler", base::MessageLoop::TYPE_DEFAULT)); |
269 application_manager_.SetLoaderForURL(loader.Pass(), | 272 application_manager_.SetLoaderForURL(loader.Pass(), |
270 GURL("mojo:android_handler")); | 273 GURL("mojo:android_handler")); |
271 } | 274 } |
272 #endif | 275 #endif |
273 | 276 |
| 277 tracing::TraceDataCollectorPtr trace_data_collector_ptr; |
| 278 application_manager_.ConnectToService(GURL("mojo:tracing"), |
| 279 &trace_data_collector_ptr); |
| 280 TracingImpl::Create(trace_data_collector_ptr.Pass()); |
| 281 |
274 if (listener_) | 282 if (listener_) |
275 listener_->WaitForListening(); | 283 listener_->WaitForListening(); |
276 | 284 |
277 return true; | 285 return true; |
278 } | 286 } |
279 | 287 |
280 void Context::OnApplicationError(const GURL& url) { | 288 void Context::OnApplicationError(const GURL& url) { |
281 if (app_urls_.find(url) != app_urls_.end()) { | 289 if (app_urls_.find(url) != app_urls_.end()) { |
282 app_urls_.erase(url); | 290 app_urls_.erase(url); |
283 if (app_urls_.empty() && base::MessageLoop::current()->is_running()) | 291 if (app_urls_.empty() && base::MessageLoop::current()->is_running()) |
(...skipping 17 matching lines...) Expand all Loading... |
301 ScopedMessagePipeHandle Context::ConnectToServiceByName( | 309 ScopedMessagePipeHandle Context::ConnectToServiceByName( |
302 const GURL& application_url, | 310 const GURL& application_url, |
303 const std::string& service_name) { | 311 const std::string& service_name) { |
304 app_urls_.insert(application_url); | 312 app_urls_.insert(application_url); |
305 return application_manager_.ConnectToServiceByName( | 313 return application_manager_.ConnectToServiceByName( |
306 application_url, service_name).Pass(); | 314 application_url, service_name).Pass(); |
307 } | 315 } |
308 | 316 |
309 } // namespace shell | 317 } // namespace shell |
310 } // namespace mojo | 318 } // namespace mojo |
OLD | NEW |