| 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" |
| (...skipping 15 matching lines...) Expand all Loading... |
| 26 #include "mojo/public/cpp/application/application_impl.h" | 26 #include "mojo/public/cpp/application/application_impl.h" |
| 27 #include "mojo/shell/dynamic_application_loader.h" | 27 #include "mojo/shell/dynamic_application_loader.h" |
| 28 #include "mojo/shell/external_application_listener.h" | 28 #include "mojo/shell/external_application_listener.h" |
| 29 #include "mojo/shell/in_process_dynamic_service_runner.h" | 29 #include "mojo/shell/in_process_dynamic_service_runner.h" |
| 30 #include "mojo/shell/out_of_process_dynamic_service_runner.h" | 30 #include "mojo/shell/out_of_process_dynamic_service_runner.h" |
| 31 #include "mojo/shell/switches.h" | 31 #include "mojo/shell/switches.h" |
| 32 #include "mojo/shell/ui_application_loader_android.h" | 32 #include "mojo/shell/ui_application_loader_android.h" |
| 33 #include "mojo/spy/spy.h" | 33 #include "mojo/spy/spy.h" |
| 34 | 34 |
| 35 #if defined(OS_ANDROID) | 35 #if defined(OS_ANDROID) |
| 36 #include "mojo/services/native_viewport/gpu_impl.h" | 36 #include "mojo/services/gles2/gpu_impl.h" |
| 37 #include "mojo/services/native_viewport/native_viewport_impl.h" | 37 #include "mojo/services/native_viewport/native_viewport_impl.h" |
| 38 #include "mojo/shell/network_application_loader.h" | 38 #include "mojo/shell/network_application_loader.h" |
| 39 #include "ui/gl/gl_share_group.h" | 39 #include "ui/gl/gl_share_group.h" |
| 40 #endif // defined(OS_ANDROID) | 40 #endif // defined(OS_ANDROID) |
| 41 | 41 |
| 42 namespace mojo { | 42 namespace mojo { |
| 43 namespace shell { | 43 namespace shell { |
| 44 namespace { | 44 namespace { |
| 45 | 45 |
| 46 // These mojo: URLs are loaded directly from the local filesystem. They | 46 // These mojo: URLs are loaded directly from the local filesystem. They |
| (...skipping 247 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 294 ScopedMessagePipeHandle Context::ConnectToServiceByName( | 294 ScopedMessagePipeHandle Context::ConnectToServiceByName( |
| 295 const GURL& application_url, | 295 const GURL& application_url, |
| 296 const std::string& service_name) { | 296 const std::string& service_name) { |
| 297 app_urls_.insert(application_url); | 297 app_urls_.insert(application_url); |
| 298 return application_manager_.ConnectToServiceByName( | 298 return application_manager_.ConnectToServiceByName( |
| 299 application_url, service_name).Pass(); | 299 application_url, service_name).Pass(); |
| 300 } | 300 } |
| 301 | 301 |
| 302 } // namespace shell | 302 } // namespace shell |
| 303 } // namespace mojo | 303 } // namespace mojo |
| OLD | NEW |