Mojo: Rename ServiceManager to ApplicationManager.
Also, ServiceLoader->ApplicationLoader, and all related implementations.
[email protected]
Review URL: https://codereview.chromium.org/455993002
Cr-Commit-Position: refs/heads/master@{#288594}
git-svn-id: svn://svn.chromium.org/chrome/trunk/src@288594 0039d316-1c4b-4281-b951-d872f2087c98
diff --git a/mojo/mojo.gyp b/mojo/mojo.gyp
index 810edd29..7290715 100644
--- a/mojo/mojo.gyp
+++ b/mojo/mojo.gyp
@@ -24,8 +24,10 @@
'target_name': 'mojo',
'type': 'none',
'dependencies': [
- 'mojo_base.gyp:mojo_base',
+ 'mojo_application_manager',
+ 'mojo_application_manager_unittests',
'mojo_apps_js_unittests',
+ 'mojo_base.gyp:mojo_base',
'mojo_compositor_app',
'mojo_content_handler_demo',
'mojo_echo_client',
@@ -41,16 +43,14 @@
'mojo_pepper_container_app',
'mojo_png_viewer',
'mojo_sample_app',
- 'mojo_service_manager',
- 'mojo_service_manager_unittests',
'mojo_shell',
'mojo_shell_lib',
'mojo_shell_tests',
'mojo_surfaces_app',
+ 'mojo_surfaces_app',
'mojo_surfaces_child_app',
'mojo_surfaces_lib',
'mojo_surfaces_lib_unittests',
- 'mojo_surfaces_app',
'mojo_surfaces_service',
'mojo_test_app',
'mojo_test_request_tracker_app',
@@ -140,7 +140,7 @@
'../base/base.gyp:base_static',
'../net/net.gyp:http_server',
'../url/url.gyp:url_lib',
- 'mojo_service_manager',
+ 'mojo_application_manager',
],
'variables': {
'mojom_base_output_dir': 'mojo',
@@ -167,6 +167,7 @@
'../base/third_party/dynamic_annotations/dynamic_annotations.gyp:dynamic_annotations',
'../net/net.gyp:net',
'../url/url.gyp:url_lib',
+ 'mojo_application_manager',
'mojo_base.gyp:mojo_application_bindings',
'mojo_base.gyp:mojo_common_lib',
'mojo_base.gyp:mojo_system_impl',
@@ -175,7 +176,6 @@
'mojo_gles2_impl',
'mojo_native_viewport_service',
'mojo_network_bindings',
- 'mojo_service_manager',
'mojo_spy',
],
'includes': [ 'public/tools/bindings/mojom_bindings_generator.gypi' ],
@@ -191,10 +191,10 @@
'shell/child_process_host.h',
'shell/context.cc',
'shell/context.h',
- 'shell/dbus_service_loader_linux.cc',
- 'shell/dbus_service_loader_linux.h',
- 'shell/dynamic_service_loader.cc',
- 'shell/dynamic_service_loader.h',
+ 'shell/dbus_application_loader_linux.cc',
+ 'shell/dbus_application_loader_linux.h',
+ 'shell/dynamic_application_loader.cc',
+ 'shell/dynamic_application_loader.h',
'shell/dynamic_service_runner.h',
'shell/init.cc',
'shell/init.h',
@@ -214,8 +214,8 @@
'shell/task_runners.h',
'shell/test_child_process.cc',
'shell/test_child_process.h',
- 'shell/ui_service_loader_android.cc',
- 'shell/ui_service_loader_android.h',
+ 'shell/ui_application_loader_android.cc',
+ 'shell/ui_application_loader_android.h',
'shell/view_manager_loader.cc',
'shell/view_manager_loader.h',
],
@@ -231,8 +231,8 @@
'mojo_network_service_lib',
],
'sources': [
- 'shell/network_service_loader.cc',
- 'shell/network_service_loader.h',
+ 'shell/network_application_loader.cc',
+ 'shell/network_application_loader.h',
],
}],
['use_aura==1', {
@@ -258,8 +258,8 @@
'../base/base.gyp:base',
'../base/base.gyp:base_static',
'../url/url.gyp:url_lib',
+ 'mojo_application_manager',
'mojo_base.gyp:mojo_system_impl',
- 'mojo_service_manager',
'mojo_shell_lib',
],
'sources': [
@@ -275,10 +275,10 @@
'../base/base.gyp:base',
'../ui/gl/gl.gyp:gl',
'../url/url.gyp:url_lib',
+ 'mojo_application_manager',
'mojo_base.gyp:mojo_common_lib',
'mojo_base.gyp:mojo_environment_chromium',
'mojo_base.gyp:mojo_system_impl',
- 'mojo_service_manager',
'mojo_shell_lib',
],
'conditions': [
@@ -304,10 +304,10 @@
# TODO(vtl): We don't currently need this, but I imagine we will soon.
# '../ui/gl/gl.gyp:gl',
'../url/url.gyp:url_lib',
+ 'mojo_application_manager',
'mojo_base.gyp:mojo_common_lib',
'mojo_base.gyp:mojo_environment_chromium',
'mojo_base.gyp:mojo_system_impl',
- 'mojo_service_manager',
'mojo_shell_lib',
'mojo_test_app',
'mojo_test_request_tracker_app',
@@ -315,7 +315,7 @@
],
'sources': [
'shell/child_process_host_unittest.cc',
- 'shell/dynamic_service_loader_unittest.cc',
+ 'shell/dynamic_application_loader_unittest.cc',
'shell/in_process_dynamic_service_runner_unittest.cc',
'shell/shell_test_base.cc',
'shell/shell_test_base.h',
@@ -331,11 +331,11 @@
],
},
{
- # GN version: //mojo/service_manager
- 'target_name': 'mojo_service_manager',
+ # GN version: //mojo/application_manager
+ 'target_name': 'mojo_application_manager',
'type': '<(component)',
'defines': [
- 'MOJO_SERVICE_MANAGER_IMPLEMENTATION',
+ 'MOJO_APPLICATION_MANAGER_IMPLEMENTATION',
],
'dependencies': [
'../base/base.gyp:base',
@@ -350,13 +350,13 @@
'<(mojo_system_for_component)',
],
'sources': [
- 'service_manager/background_shell_service_loader.cc',
- 'service_manager/background_shell_service_loader.h',
- 'service_manager/service_loader.cc',
- 'service_manager/service_loader.h',
- 'service_manager/service_manager.cc',
- 'service_manager/service_manager.h',
- 'service_manager/service_manager_export.h',
+ 'application_manager/application_loader.cc',
+ 'application_manager/application_loader.h',
+ 'application_manager/application_manager.cc',
+ 'application_manager/application_manager.h',
+ 'application_manager/application_manager_export.h',
+ 'application_manager/background_shell_application_loader.cc',
+ 'application_manager/background_shell_application_loader.h',
],
'export_dependent_settings': [
'../base/third_party/dynamic_annotations/dynamic_annotations.gyp:dynamic_annotations',
@@ -364,24 +364,24 @@
],
},
{
- 'target_name': 'mojo_service_manager_unittests',
+ 'target_name': 'mojo_application_manager_unittests',
'type': 'executable',
'dependencies': [
'../base/base.gyp:base',
'../testing/gtest.gyp:gtest',
'../url/url.gyp:url_lib',
+ 'mojo_application_manager',
'mojo_base.gyp:mojo_common_lib',
'mojo_base.gyp:mojo_cpp_bindings',
'mojo_base.gyp:mojo_environment_chromium',
'mojo_base.gyp:mojo_run_all_unittests',
'mojo_base.gyp:mojo_application_chromium',
- 'mojo_service_manager',
],
'includes': [ 'public/tools/bindings/mojom_bindings_generator.gypi' ],
'sources': [
- 'service_manager/background_shell_service_loader_unittest.cc',
- 'service_manager/service_manager_unittest.cc',
- 'service_manager/test.mojom',
+ 'application_manager/application_manager_unittest.cc',
+ 'application_manager/background_shell_application_loader_unittest.cc',
+ 'application_manager/test.mojom',
],
},
{
