diff options
61 files changed, 110 insertions, 102 deletions
diff --git a/content/app/BUILD.gn b/content/app/BUILD.gn index 3052fd4..cefe814 100644 --- a/content/app/BUILD.gn +++ b/content/app/BUILD.gn @@ -52,7 +52,7 @@ if (is_ios) { } else { content_app_deps += [ "//mojo/environment:chromium", - "//mojo/public/interfaces/service_provider", + "//mojo/public/interfaces/application", "//mojo/service_manager", "//mojo/system", ] diff --git a/content/browser/BUILD.gn b/content/browser/BUILD.gn index d08e80d..76fb114 100644 --- a/content/browser/BUILD.gn +++ b/content/browser/BUILD.gn @@ -92,7 +92,7 @@ source_set("browser") { "//cc", "//cc/surfaces", "//mojo/public/cpp/bindings", - "//mojo/public/interfaces/service_provider", + "//mojo/public/interfaces/application", "//mojo/public/js/bindings", "//net:http_server", "//third_party/icu", diff --git a/content/child/BUILD.gn b/content/child/BUILD.gn index 873c13b..e77fcd8 100644 --- a/content/child/BUILD.gn +++ b/content/child/BUILD.gn @@ -18,7 +18,7 @@ source_set("child") { "//base", "//components/tracing", "//mojo/environment:chromium", - "//mojo/public/interfaces/service_provider", + "//mojo/public/interfaces/application", "//skia", "//third_party/icu", "//ui/base", diff --git a/content/common/BUILD.gn b/content/common/BUILD.gn index 038d758..0e44b2c 100644 --- a/content/common/BUILD.gn +++ b/content/common/BUILD.gn @@ -60,7 +60,7 @@ source_set("common") { "//gpu/skia_bindings", "//media", "//media:shared_memory_support", - "//mojo/public/interfaces/service_provider", + "//mojo/public/interfaces/application", "//third_party/WebKit/public:blink", "//ui/gl", "//webkit/browser:storage", @@ -276,6 +276,6 @@ mojom("mojo_bindings") { ] deps = [ - "//mojo/public/interfaces/service_provider:service_provider", + "//mojo/public/interfaces/application:application", ] } diff --git a/content/common/mojo/service_registry_impl.h b/content/common/mojo/service_registry_impl.h index d3ca173..fe78364 100644 --- a/content/common/mojo/service_registry_impl.h +++ b/content/common/mojo/service_registry_impl.h @@ -15,7 +15,7 @@ #include "content/public/common/service_registry.h" #include "mojo/public/cpp/bindings/interface_impl.h" #include "mojo/public/cpp/system/core.h" -#include "mojo/public/interfaces/service_provider/service_provider.mojom.h" +#include "mojo/public/interfaces/application/service_provider.mojom.h" namespace content { diff --git a/content/common/render_frame_setup.mojom b/content/common/render_frame_setup.mojom index 7d108e5..dfe89ce 100644 --- a/content/common/render_frame_setup.mojom +++ b/content/common/render_frame_setup.mojom @@ -2,7 +2,7 @@ // Use of this source code is governed by a BSD-style license that can be // found in the LICENSE file. -import "../../mojo/public/interfaces/service_provider/service_provider.mojom" +import "../../mojo/public/interfaces/application/service_provider.mojom" module content { diff --git a/content/content_app.gypi b/content/content_app.gypi index deeea45..24ddad5 100644 --- a/content/content_app.gypi +++ b/content/content_app.gypi @@ -66,9 +66,9 @@ ], }, { # OS!="ios" 'dependencies': [ + '../mojo/mojo_base.gyp:mojo_application_bindings', '../mojo/mojo_base.gyp:mojo_environment_chromium', '../mojo/mojo_base.gyp:mojo_system_impl', - '../mojo/mojo_base.gyp:mojo_service_provider_bindings', '../mojo/mojo.gyp:mojo_service_manager', ], }], diff --git a/content/content_browser.gypi b/content/content_browser.gypi index 688562d..8adb26e 100644 --- a/content/content_browser.gypi +++ b/content/content_browser.gypi @@ -1567,7 +1567,7 @@ 'content_common_mojo_bindings', '../cc/cc.gyp:cc', '../cc/cc.gyp:cc_surfaces', - '../mojo/mojo_base.gyp:mojo_service_provider_bindings', + '../mojo/mojo_base.gyp:mojo_application_bindings', '../mojo/mojo_base.gyp:mojo_cpp_bindings', '../mojo/mojo_base.gyp:mojo_js_bindings', '../net/net.gyp:http_server', diff --git a/content/content_child.gypi b/content/content_child.gypi index 30d2c2d..4e5784f 100644 --- a/content/content_child.gypi +++ b/content/content_child.gypi @@ -6,8 +6,8 @@ 'dependencies': [ '../base/base.gyp:base', '../components/tracing.gyp:tracing', + '../mojo/mojo_base.gyp:mojo_application_bindings', '../mojo/mojo_base.gyp:mojo_environment_chromium', - '../mojo/mojo_base.gyp:mojo_service_provider_bindings', '../skia/skia.gyp:skia', '../ui/base/ui_base.gyp:ui_base', '../ui/gfx/gfx.gyp:gfx', diff --git a/content/content_common.gypi b/content/content_common.gypi index 844f149..e46690c 100644 --- a/content/content_common.gypi +++ b/content/content_common.gypi @@ -553,7 +553,7 @@ '../ipc/ipc.gyp:ipc', '../media/media.gyp:media', '../media/media.gyp:shared_memory_support', - '../mojo/mojo_base.gyp:mojo_service_provider_bindings', + '../mojo/mojo_base.gyp:mojo_application_bindings', '../mojo/mojo_base.gyp:mojo_cpp_bindings', '../mojo/mojo_base.gyp:mojo_environment_chromium', '../mojo/mojo_base.gyp:mojo_system_impl', diff --git a/content/content_common_mojo_bindings.gypi b/content/content_common_mojo_bindings.gypi index 35c5264..85b784d 100644 --- a/content/content_common_mojo_bindings.gypi +++ b/content/content_common_mojo_bindings.gypi @@ -8,18 +8,18 @@ 'target_name': 'content_common_mojo_bindings', 'type': 'static_library', 'dependencies': [ + '../mojo/mojo_base.gyp:mojo_application_bindings', '../mojo/mojo_base.gyp:mojo_cpp_bindings', '../mojo/mojo_base.gyp:mojo_environment_chromium', - '../mojo/mojo_base.gyp:mojo_service_provider_bindings' ], 'sources': [ 'common/render_frame_setup.mojom', ], 'includes': [ '../mojo/public/tools/bindings/mojom_bindings_generator.gypi' ], 'export_dependent_settings': [ + '../mojo/mojo_base.gyp:mojo_application_bindings', '../mojo/mojo_base.gyp:mojo_cpp_bindings', '../mojo/mojo_base.gyp:mojo_environment_chromium', - '../mojo/mojo_base.gyp:mojo_service_provider_bindings' ], }, ], diff --git a/content/content_gpu.gypi b/content/content_gpu.gypi index bbfd152..df99270 100644 --- a/content/content_gpu.gypi +++ b/content/content_gpu.gypi @@ -5,7 +5,7 @@ { 'dependencies': [ '../base/base.gyp:base', - '../mojo/mojo_base.gyp:mojo_service_provider_bindings', + '../mojo/mojo_base.gyp:mojo_application_bindings', '../skia/skia.gyp:skia', '../ui/gl/gl.gyp:gl', ], diff --git a/content/content_plugin.gypi b/content/content_plugin.gypi index a73d42c..aad04bd 100644 --- a/content/content_plugin.gypi +++ b/content/content_plugin.gypi @@ -6,7 +6,7 @@ 'conditions': [ ['enable_plugins==1 and OS!="linux"', { 'dependencies': [ - '../mojo/mojo_base.gyp:mojo_service_provider_bindings', + '../mojo/mojo_base.gyp:mojo_application_bindings', '../skia/skia.gyp:skia', '../third_party/WebKit/public/blink.gyp:blink', '../third_party/npapi/npapi.gyp:npapi', diff --git a/content/content_ppapi_plugin.gypi b/content/content_ppapi_plugin.gypi index 5c43f6b..2376b80 100644 --- a/content/content_ppapi_plugin.gypi +++ b/content/content_ppapi_plugin.gypi @@ -7,7 +7,7 @@ ['enable_plugins==1', { 'dependencies': [ '../base/base.gyp:base', - '../mojo/mojo_base.gyp:mojo_service_provider_bindings', + '../mojo/mojo_base.gyp:mojo_application_bindings', '../ppapi/ppapi_internal.gyp:ppapi_ipc', '../ui/base/ui_base.gyp:ui_base', '../ui/gfx/gfx.gyp:gfx', diff --git a/content/content_renderer.gypi b/content/content_renderer.gypi index be2c867..f0da36b 100644 --- a/content/content_renderer.gypi +++ b/content/content_renderer.gypi @@ -12,9 +12,9 @@ '../gpu/gpu.gyp:gpu', '../jingle/jingle.gyp:jingle_glue', '../media/media.gyp:media', + '../mojo/mojo_base.gyp:mojo_application_bindings', '../mojo/mojo_base.gyp:mojo_environment_chromium', '../mojo/mojo_base.gyp:mojo_js_bindings_lib', - '../mojo/mojo_base.gyp:mojo_service_provider_bindings', '../net/net.gyp:net', '../skia/skia.gyp:skia', '../third_party/WebKit/public/blink.gyp:blink', diff --git a/content/content_utility.gypi b/content/content_utility.gypi index b1a04ff..aee298d 100644 --- a/content/content_utility.gypi +++ b/content/content_utility.gypi @@ -6,7 +6,7 @@ 'dependencies': [ '../base/base.gyp:base', '../courgette/courgette.gyp:courgette_lib', - '../mojo/mojo_base.gyp:mojo_service_provider_bindings', + '../mojo/mojo_base.gyp:mojo_application_bindings', ], 'sources': [ 'public/utility/content_utility_client.cc', diff --git a/content/gpu/BUILD.gn b/content/gpu/BUILD.gn index d95552d..02f0de6 100644 --- a/content/gpu/BUILD.gn +++ b/content/gpu/BUILD.gn @@ -27,7 +27,7 @@ source_set("gpu") { deps = [ "//base", "//content:export", - "//mojo/public/interfaces/service_provider", + "//mojo/public/interfaces/application", "//skia", "//ui/gl", ] diff --git a/content/plugin/BUILD.gn b/content/plugin/BUILD.gn index a5e6481..80c42958 100644 --- a/content/plugin/BUILD.gn +++ b/content/plugin/BUILD.gn @@ -29,7 +29,7 @@ if (enable_plugins && !is_linux) { deps = [ "//content:export", - "//mojo/public/interfaces/service_provider", + "//mojo/public/interfaces/application", "//skia", "//third_party/npapi", "//third_party/WebKit/public:blink", diff --git a/content/ppapi_plugin/BUILD.gn b/content/ppapi_plugin/BUILD.gn index b27ae34..55c5d3b 100644 --- a/content/ppapi_plugin/BUILD.gn +++ b/content/ppapi_plugin/BUILD.gn @@ -21,7 +21,7 @@ source_set("ppapi_plugin") { deps = [ "//base", "//content:export", - "//mojo/public/interfaces/service_provider", + "//mojo/public/interfaces/application", "//ppapi:ppapi_ipc", "//skia", "//third_party/icu", diff --git a/content/renderer/BUILD.gn b/content/renderer/BUILD.gn index a357442..6dacd5a 100644 --- a/content/renderer/BUILD.gn +++ b/content/renderer/BUILD.gn @@ -31,7 +31,7 @@ source_set("renderer") { "//mojo/bindings/js", "//mojo/environment:chromium", "//mojo/public/js/bindings", - "//mojo/public/interfaces/service_provider", + "//mojo/public/interfaces/application", "//net", "//skia", "//third_party/icu", diff --git a/content/utility/BUILD.gn b/content/utility/BUILD.gn index 1cc0ead..06d06bb 100644 --- a/content/utility/BUILD.gn +++ b/content/utility/BUILD.gn @@ -17,7 +17,7 @@ source_set("utility") { "//base", "//content:export", "//courgette:courgette_lib", - "//mojo/public/interfaces/service_provider", + "//mojo/public/interfaces/application", "//third_party/WebKit/public:blink_headers", ] } diff --git a/mojo/dbus/dbus_external_service.cc b/mojo/dbus/dbus_external_service.cc index fad451c..65b4bf1 100644 --- a/mojo/dbus/dbus_external_service.cc +++ b/mojo/dbus/dbus_external_service.cc @@ -16,7 +16,6 @@ #include "dbus/object_path.h" #include "mojo/embedder/channel_init.h" #include "mojo/public/cpp/bindings/error_handler.h" -#include "mojo/public/interfaces/service_provider/service_provider.mojom.h" #include "mojo/shell/external_service.mojom.h" namespace mojo { diff --git a/mojo/dbus/dbus_external_service.h b/mojo/dbus/dbus_external_service.h index ea4c602..b9cbb2c 100644 --- a/mojo/dbus/dbus_external_service.h +++ b/mojo/dbus/dbus_external_service.h @@ -13,7 +13,6 @@ #include "mojo/public/cpp/application/application_impl.h" #include "mojo/public/cpp/application/interface_factory.h" #include "mojo/public/cpp/bindings/interface_request.h" -#include "mojo/public/interfaces/service_provider/service_provider.mojom.h" #include "mojo/shell/external_service.mojom.h" namespace mojo { diff --git a/mojo/examples/aura_demo/aura_demo.cc b/mojo/examples/aura_demo/aura_demo.cc index 636b78a..97b530c 100644 --- a/mojo/examples/aura_demo/aura_demo.cc +++ b/mojo/examples/aura_demo/aura_demo.cc @@ -13,7 +13,6 @@ #include "mojo/public/cpp/application/application_connection.h" #include "mojo/public/cpp/application/application_delegate.h" #include "mojo/public/cpp/system/core.h" -#include "mojo/public/interfaces/service_provider/service_provider.mojom.h" #include "mojo/services/public/cpp/view_manager/node.h" #include "mojo/services/public/cpp/view_manager/view.h" #include "mojo/services/public/cpp/view_manager/view_manager.h" diff --git a/mojo/examples/compositor_app/compositor_app.cc b/mojo/examples/compositor_app/compositor_app.cc index 54aa235..fd66b90 100644 --- a/mojo/examples/compositor_app/compositor_app.cc +++ b/mojo/examples/compositor_app/compositor_app.cc @@ -11,7 +11,6 @@ #include "mojo/public/cpp/application/application_impl.h" #include "mojo/public/cpp/gles2/gles2.h" #include "mojo/public/cpp/system/core.h" -#include "mojo/public/interfaces/service_provider/service_provider.mojom.h" #include "mojo/services/public/cpp/geometry/geometry_type_converters.h" #include "mojo/services/public/interfaces/native_viewport/native_viewport.mojom.h" #include "ui/gfx/rect.h" diff --git a/mojo/examples/dbus_echo/dbus_echo_app.cc b/mojo/examples/dbus_echo/dbus_echo_app.cc index 948ad8c..ea18f8b 100644 --- a/mojo/examples/dbus_echo/dbus_echo_app.cc +++ b/mojo/examples/dbus_echo/dbus_echo_app.cc @@ -12,7 +12,6 @@ #include "mojo/public/cpp/environment/environment.h" #include "mojo/public/cpp/system/core.h" #include "mojo/public/cpp/system/macros.h" -#include "mojo/public/interfaces/service_provider/service_provider.mojom.h" #include "mojo/services/dbus_echo/echo.mojom.h" namespace mojo { diff --git a/mojo/examples/pepper_container_app/pepper_container_app.cc b/mojo/examples/pepper_container_app/pepper_container_app.cc index cec08cd..107f6fd 100644 --- a/mojo/examples/pepper_container_app/pepper_container_app.cc +++ b/mojo/examples/pepper_container_app/pepper_container_app.cc @@ -15,7 +15,6 @@ #include "mojo/public/cpp/application/application_impl.h" #include "mojo/public/cpp/gles2/gles2.h" #include "mojo/public/cpp/system/core.h" -#include "mojo/public/interfaces/service_provider/service_provider.mojom.h" #include "mojo/services/public/interfaces/native_viewport/native_viewport.mojom.h" #include "ppapi/c/pp_rect.h" #include "ppapi/shared_impl/proxy_lock.h" diff --git a/mojo/examples/sample_app/sample_app.cc b/mojo/examples/sample_app/sample_app.cc index 1b8e874..c60e873 100644 --- a/mojo/examples/sample_app/sample_app.cc +++ b/mojo/examples/sample_app/sample_app.cc @@ -13,7 +13,6 @@ #include "mojo/public/cpp/system/core.h" #include "mojo/public/cpp/system/macros.h" #include "mojo/public/cpp/utility/run_loop.h" -#include "mojo/public/interfaces/service_provider/service_provider.mojom.h" #include "mojo/services/public/interfaces/native_viewport/native_viewport.mojom.h" namespace examples { diff --git a/mojo/examples/surfaces_app/surfaces_app.cc b/mojo/examples/surfaces_app/surfaces_app.cc index 30c0ec02..6b7a9e9 100644 --- a/mojo/examples/surfaces_app/surfaces_app.cc +++ b/mojo/examples/surfaces_app/surfaces_app.cc @@ -11,7 +11,6 @@ #include "mojo/public/cpp/application/application_connection.h" #include "mojo/public/cpp/application/application_delegate.h" #include "mojo/public/cpp/system/core.h" -#include "mojo/public/interfaces/service_provider/service_provider.mojom.h" #include "mojo/services/gles2/command_buffer.mojom.h" #include "mojo/services/public/cpp/geometry/geometry_type_converters.h" #include "mojo/services/public/cpp/surfaces/surfaces_type_converters.h" diff --git a/mojo/examples/window_manager/debug_panel.h b/mojo/examples/window_manager/debug_panel.h index 181de76..843c937 100644 --- a/mojo/examples/window_manager/debug_panel.h +++ b/mojo/examples/window_manager/debug_panel.h @@ -7,7 +7,6 @@ #include <string> -#include "mojo/public/interfaces/service_provider/service_provider.mojom.h" #include "mojo/services/public/interfaces/navigation/navigation.mojom.h" #include "ui/views/controls/button/button.h" #include "ui/views/layout/layout_manager.h" diff --git a/mojo/mojo.gyp b/mojo/mojo.gyp index 270cec9..89ddc27 100644 --- a/mojo/mojo.gyp +++ b/mojo/mojo.gyp @@ -163,8 +163,8 @@ '../base/third_party/dynamic_annotations/dynamic_annotations.gyp:dynamic_annotations', '../net/net.gyp:net', '../url/url.gyp:url_lib', + 'mojo_base.gyp:mojo_application_bindings', 'mojo_base.gyp:mojo_common_lib', - 'mojo_base.gyp:mojo_service_provider_bindings', 'mojo_base.gyp:mojo_system_impl', 'mojo_base.gyp:mojo_application', 'mojo_external_service_bindings', @@ -338,9 +338,9 @@ '../base/third_party/dynamic_annotations/dynamic_annotations.gyp:dynamic_annotations', '../net/net.gyp:net', '../url/url.gyp:url_lib', + 'mojo_base.gyp:mojo_application_bindings', 'mojo_base.gyp:mojo_common_lib', 'mojo_base.gyp:mojo_environment_chromium', - 'mojo_base.gyp:mojo_service_provider_bindings', '<(mojo_system_for_component)', ], 'sources': [ @@ -353,7 +353,7 @@ ], 'export_dependent_settings': [ '../base/third_party/dynamic_annotations/dynamic_annotations.gyp:dynamic_annotations', - 'mojo_base.gyp:mojo_service_provider_bindings', + 'mojo_base.gyp:mojo_application_bindings', ], }, { @@ -416,10 +416,10 @@ '../ui/gfx/gfx.gyp:gfx', '../ui/gfx/gfx.gyp:gfx_geometry', '../ui/gl/gl.gyp:gl', + 'mojo_base.gyp:mojo_application_bindings', 'mojo_base.gyp:mojo_common_lib', 'mojo_base.gyp:mojo_environment_chromium', 'mojo_base.gyp:mojo_jni_headers', - 'mojo_base.gyp:mojo_service_provider_bindings', 'mojo_shell_lib', ], 'sources': [ diff --git a/mojo/mojo_public.gypi b/mojo/mojo_public.gypi index a728bdc..63c4692 100644 --- a/mojo/mojo_public.gypi +++ b/mojo/mojo_public.gypi @@ -164,11 +164,13 @@ ], }, { - # GN version: //mojo/public/interfaces/service_provider - 'target_name': 'mojo_service_provider_bindings', + # GN version: //mojo/public/interfaces/application:application + 'target_name': 'mojo_application_bindings', 'type': 'static_library', 'sources': [ - 'public/interfaces/service_provider/service_provider.mojom', + 'public/interfaces/application/application.mojom', + 'public/interfaces/application/service_provider.mojom', + 'public/interfaces/application/shell.mojom', ], 'includes': [ 'public/tools/bindings/mojom_bindings_generator.gypi' ], 'dependencies': [ @@ -198,10 +200,10 @@ 'public/cpp/application/lib/service_registry.h', ], 'dependencies': [ - 'mojo_service_provider_bindings', + 'mojo_application_bindings', ], 'export_dependent_settings': [ - 'mojo_service_provider_bindings', + 'mojo_application_bindings', ], }, ], diff --git a/mojo/mojo_services.gypi b/mojo/mojo_services.gypi index 1a73af5..de07a71 100644 --- a/mojo/mojo_services.gypi +++ b/mojo/mojo_services.gypi @@ -521,8 +521,8 @@ '../ui/events/events.gyp:events', '../ui/gfx/gfx.gyp:gfx', '../ui/gfx/gfx.gyp:gfx_geometry', - 'mojo_base.gyp:mojo_application', - 'mojo_base.gyp:mojo_service_provider_bindings', + 'mojo_base.gyp:mojo_application', + 'mojo_base.gyp:mojo_application_bindings', 'mojo_geometry_bindings', 'mojo_geometry_lib', 'mojo_view_manager_bindings', diff --git a/mojo/public/BUILD.gn b/mojo/public/BUILD.gn index 9ad2936..42a0efa 100644 --- a/mojo/public/BUILD.gn +++ b/mojo/public/BUILD.gn @@ -10,7 +10,7 @@ group("public") { "//mojo/public/cpp/environment:standalone", "//mojo/public/cpp/utility", "//mojo/public/interfaces/bindings/tests:test_interfaces", - "//mojo/public/interfaces/service_provider", + "//mojo/public/interfaces/application", "//mojo/public/js/bindings", ] diff --git a/mojo/public/cpp/application/BUILD.gn b/mojo/public/cpp/application/BUILD.gn index 2036096..5b7cc13 100644 --- a/mojo/public/cpp/application/BUILD.gn +++ b/mojo/public/cpp/application/BUILD.gn @@ -17,7 +17,7 @@ source_set("application") { deps = [ "//mojo/public/cpp/bindings", - "//mojo/public/interfaces/service_provider", + "//mojo/public/interfaces/application", ] } diff --git a/mojo/public/cpp/application/DEPS b/mojo/public/cpp/application/DEPS index e808b79..83093de 100644 --- a/mojo/public/cpp/application/DEPS +++ b/mojo/public/cpp/application/DEPS @@ -1,6 +1,6 @@ include_rules = [ "+mojo/public/cpp/bindings", - "+mojo/public/interfaces/service_provider", + "+mojo/public/interfaces/application", ] specific_include_rules = { diff --git a/mojo/public/cpp/application/application_connection.h b/mojo/public/cpp/application/application_connection.h index c0e3480..d5d6dde 100644 --- a/mojo/public/cpp/application/application_connection.h +++ b/mojo/public/cpp/application/application_connection.h @@ -8,6 +8,7 @@ #include <string> #include "mojo/public/cpp/application/lib/service_connector.h" +#include "mojo/public/interfaces/application/service_provider.mojom.h" namespace mojo { diff --git a/mojo/public/cpp/application/application_impl.h b/mojo/public/cpp/application/application_impl.h index 073cfd9..37a95fb 100644 --- a/mojo/public/cpp/application/application_impl.h +++ b/mojo/public/cpp/application/application_impl.h @@ -10,7 +10,8 @@ #include "mojo/public/cpp/application/lib/service_connector.h" #include "mojo/public/cpp/application/lib/service_registry.h" #include "mojo/public/cpp/system/core.h" -#include "mojo/public/interfaces/service_provider/service_provider.mojom.h" +#include "mojo/public/interfaces/application/application.mojom.h" +#include "mojo/public/interfaces/application/shell.mojom.h" #if defined(WIN32) #if !defined(CDECL) diff --git a/mojo/public/cpp/application/connect.h b/mojo/public/cpp/application/connect.h index 7160316..a41c028 100644 --- a/mojo/public/cpp/application/connect.h +++ b/mojo/public/cpp/application/connect.h @@ -5,7 +5,7 @@ #ifndef MOJO_PUBLIC_CPP_APPLICATION_CONNECT_H_ #define MOJO_PUBLIC_CPP_APPLICATION_CONNECT_H_ -#include "mojo/public/interfaces/service_provider/service_provider.mojom.h" +#include "mojo/public/interfaces/application/service_provider.mojom.h" namespace mojo { diff --git a/mojo/public/cpp/application/lazy_interface_ptr.h b/mojo/public/cpp/application/lazy_interface_ptr.h index d8883c4..62d0ae9 100644 --- a/mojo/public/cpp/application/lazy_interface_ptr.h +++ b/mojo/public/cpp/application/lazy_interface_ptr.h @@ -8,7 +8,7 @@ #include <string> #include "mojo/public/cpp/application/connect.h" -#include "mojo/public/interfaces/service_provider/service_provider.mojom.h" +#include "mojo/public/interfaces/application/service_provider.mojom.h" namespace mojo { diff --git a/mojo/public/cpp/application/lib/service_connector.h b/mojo/public/cpp/application/lib/service_connector.h index aeb7de1..9ddaeb7 100644 --- a/mojo/public/cpp/application/lib/service_connector.h +++ b/mojo/public/cpp/application/lib/service_connector.h @@ -7,7 +7,6 @@ #include "mojo/public/cpp/application/interface_factory.h" #include "mojo/public/cpp/bindings/interface_request.h" -#include "mojo/public/interfaces/service_provider/service_provider.mojom.h" namespace mojo { class ApplicationConnection; diff --git a/mojo/public/cpp/application/lib/service_registry.h b/mojo/public/cpp/application/lib/service_registry.h index 8f77259..3400b67e 100644 --- a/mojo/public/cpp/application/lib/service_registry.h +++ b/mojo/public/cpp/application/lib/service_registry.h @@ -6,10 +6,11 @@ #define MOJO_PUBLIC_CPP_APPLICATION_LIB_SERVICE_REGISTRY_H_ #include "mojo/public/cpp/application/application_connection.h" -#include "mojo/public/interfaces/service_provider/service_provider.mojom.h" +#include "mojo/public/interfaces/application/service_provider.mojom.h" namespace mojo { +class Application; class ApplicationImpl; namespace internal { diff --git a/mojo/public/interfaces/service_provider/BUILD.gn b/mojo/public/interfaces/application/BUILD.gn index 990d3e9..41a9175 100644 --- a/mojo/public/interfaces/service_provider/BUILD.gn +++ b/mojo/public/interfaces/application/BUILD.gn @@ -4,8 +4,10 @@ import("//mojo/public/tools/bindings/mojom.gni") -mojom("service_provider") { +mojom("application") { sources = [ + "application.mojom", "service_provider.mojom", + "shell.mojom", ] } diff --git a/mojo/public/interfaces/application/application.mojom b/mojo/public/interfaces/application/application.mojom new file mode 100644 index 0000000..8828903 --- /dev/null +++ b/mojo/public/interfaces/application/application.mojom @@ -0,0 +1,16 @@ +// Copyright 2014 The Chromium Authors. All rights reserved. +// Use of this source code is governed by a BSD-style license that can be +// found in the LICENSE file. + +import "mojo/public/interfaces/application/service_provider.mojom" + +module mojo { + +// Applications vend Services through the ServiceProvider interface. Services +// implement Interfaces. +[Client=Shell] +interface Application { + AcceptConnection(string requestor_url, ServiceProvider provider); +}; + +} diff --git a/mojo/public/interfaces/application/service_provider.mojom b/mojo/public/interfaces/application/service_provider.mojom new file mode 100644 index 0000000..1d006b4 --- /dev/null +++ b/mojo/public/interfaces/application/service_provider.mojom @@ -0,0 +1,16 @@ +// Copyright 2014 The Chromium Authors. All rights reserved. +// Use of this source code is governed by a BSD-style license that can be +// found in the LICENSE file. + +module mojo { + +// ServiceProvider is used to establish connections to services in a bi- +// directional fashion between two applications. +[Client=ServiceProvider] +interface ServiceProvider { + // Connect the given message pipe handle to the named service. If the named + // service does not exist, then the handle will be closed. + ConnectToService(string interface_name, handle<message_pipe> pipe); +}; + +} diff --git a/mojo/public/interfaces/application/shell.mojom b/mojo/public/interfaces/application/shell.mojom new file mode 100644 index 0000000..f2a39fc --- /dev/null +++ b/mojo/public/interfaces/application/shell.mojom @@ -0,0 +1,18 @@ +// Copyright 2014 The Chromium Authors. All rights reserved. +// Use of this source code is governed by a BSD-style license that can be +// found in the LICENSE file. + +import "mojo/public/interfaces/application/service_provider.mojom" + +module mojo { + +// The Shell is the finder and launcher of Applications. An Application uses +// it's Shell interface to connect to other Applications. +[Client=Application] +interface Shell { + // Loads url. mojo:{service} will result in the user of the value of the + // --origin flag to the shell being used. + ConnectToApplication(string application_url, ServiceProvider& provider); +}; + +} diff --git a/mojo/public/interfaces/service_provider/service_provider.mojom b/mojo/public/interfaces/service_provider/service_provider.mojom deleted file mode 100644 index de7ddf5..0000000 --- a/mojo/public/interfaces/service_provider/service_provider.mojom +++ /dev/null @@ -1,32 +0,0 @@ -// Copyright 2013 The Chromium Authors. All rights reserved. -// Use of this source code is governed by a BSD-style license that can be -// found in the LICENSE file. - -// Quick definitions: -// The Shell is the finder and launcher of Applications. -// Applications vend Services through the ServiceProvider interface. -// Services implement Interfaces. -// An Application uses it's Shell interface to connect to other Applications. -module mojo { - -[Client=ServiceProvider] -interface ServiceProvider { - // Loads url. mojo:{service} will result in the the value of the - // --origin flag to the shell being used. - ConnectToService(string interface_name, handle<message_pipe> client_handle); -}; - -// TODO(davemore): Break Application & Shell into their own files. -[Client=Application] -interface Shell { - // Loads url. mojo:{service} will result in the user of the value of the - // --origin flag to the shell being used. - ConnectToApplication(string application_url, ServiceProvider& provider); -}; - -[Client=Shell] -interface Application { - AcceptConnection(string requestor_url, ServiceProvider provider); -}; - -} diff --git a/mojo/service_manager/BUILD.gn b/mojo/service_manager/BUILD.gn index 584b4f5..2bac965 100644 --- a/mojo/service_manager/BUILD.gn +++ b/mojo/service_manager/BUILD.gn @@ -23,11 +23,11 @@ component("service_manager") { "//url", "//mojo/common", "//mojo/environment:chromium", - "//mojo/public/interfaces/service_provider:service_provider", + "//mojo/public/interfaces/application:application", "//mojo/system", ] forward_dependent_configs_from = [ - "//mojo/public/interfaces/service_provider:service_provider", + "//mojo/public/interfaces/application:application", ] } diff --git a/mojo/service_manager/service_loader.h b/mojo/service_manager/service_loader.h index e69e0fd..07be7d9 100644 --- a/mojo/service_manager/service_loader.h +++ b/mojo/service_manager/service_loader.h @@ -6,7 +6,6 @@ #define MOJO_SERVICE_MANAGER_SERVICE_LOADER_H_ #include "mojo/public/cpp/system/core.h" -#include "mojo/public/interfaces/service_provider/service_provider.mojom.h" #include "mojo/service_manager/service_manager_export.h" #include "url/gurl.h" diff --git a/mojo/service_manager/service_manager.cc b/mojo/service_manager/service_manager.cc index 0f13cfd..51efd41 100644 --- a/mojo/service_manager/service_manager.cc +++ b/mojo/service_manager/service_manager.cc @@ -11,6 +11,8 @@ #include "base/macros.h" #include "base/stl_util.h" #include "mojo/common/common_type_converters.h" +#include "mojo/public/interfaces/application/application.mojom.h" +#include "mojo/public/interfaces/application/shell.mojom.h" #include "mojo/service_manager/service_loader.h" namespace mojo { diff --git a/mojo/service_manager/service_manager.h b/mojo/service_manager/service_manager.h index 8809e86..69ebda6 100644 --- a/mojo/service_manager/service_manager.h +++ b/mojo/service_manager/service_manager.h @@ -10,7 +10,7 @@ #include "base/basictypes.h" #include "base/gtest_prod_util.h" #include "base/memory/scoped_ptr.h" -#include "mojo/public/interfaces/service_provider/service_provider.mojom.h" +#include "mojo/public/interfaces/application/service_provider.mojom.h" #include "mojo/service_manager/service_loader.h" #include "mojo/service_manager/service_manager_export.h" #include "url/gurl.h" diff --git a/mojo/service_manager/service_manager_unittest.cc b/mojo/service_manager/service_manager_unittest.cc index b1abb79..f4b24ef 100644 --- a/mojo/service_manager/service_manager_unittest.cc +++ b/mojo/service_manager/service_manager_unittest.cc @@ -9,7 +9,7 @@ #include "mojo/public/cpp/application/application_delegate.h" #include "mojo/public/cpp/application/application_impl.h" #include "mojo/public/cpp/application/interface_factory.h" -#include "mojo/public/interfaces/service_provider/service_provider.mojom.h" +#include "mojo/public/interfaces/application/service_provider.mojom.h" #include "mojo/service_manager/background_service_loader.h" #include "mojo/service_manager/service_loader.h" #include "mojo/service_manager/service_manager.h" diff --git a/mojo/services/html_viewer/html_document_view.h b/mojo/services/html_viewer/html_document_view.h index 8c816b9..e2972c1 100644 --- a/mojo/services/html_viewer/html_document_view.h +++ b/mojo/services/html_viewer/html_document_view.h @@ -8,7 +8,6 @@ #include "base/compiler_specific.h" #include "base/memory/weak_ptr.h" #include "mojo/public/cpp/application/lazy_interface_ptr.h" -#include "mojo/public/interfaces/service_provider/service_provider.mojom.h" #include "mojo/services/public/cpp/view_manager/node_observer.h" #include "mojo/services/public/cpp/view_manager/view_observer.h" #include "mojo/services/public/interfaces/navigation/navigation.mojom.h" diff --git a/mojo/services/native_viewport/native_viewport_service.cc b/mojo/services/native_viewport/native_viewport_service.cc index cc971b7..2903de0 100644 --- a/mojo/services/native_viewport/native_viewport_service.cc +++ b/mojo/services/native_viewport/native_viewport_service.cc @@ -10,7 +10,6 @@ #include "base/time/time.h" #include "mojo/public/cpp/application/application_delegate.h" #include "mojo/public/cpp/application/interface_factory.h" -#include "mojo/public/interfaces/service_provider/service_provider.mojom.h" #include "mojo/services/gles2/command_buffer_impl.h" #include "mojo/services/native_viewport/native_viewport.h" #include "mojo/services/public/cpp/geometry/geometry_type_converters.h" diff --git a/mojo/services/network/main.cc b/mojo/services/network/main.cc index 9fbbe5a..bdfbda2 100644 --- a/mojo/services/network/main.cc +++ b/mojo/services/network/main.cc @@ -13,7 +13,6 @@ #include "mojo/public/cpp/application/application_impl.h" #include "mojo/public/cpp/application/interface_factory.h" #include "mojo/public/cpp/bindings/interface_ptr.h" -#include "mojo/public/interfaces/service_provider/service_provider.mojom.h" #include "mojo/services/network/network_context.h" #include "mojo/services/network/network_service_impl.h" diff --git a/mojo/services/public/cpp/view_manager/BUILD.gn b/mojo/services/public/cpp/view_manager/BUILD.gn index 8e707d8..ccd6c4c 100644 --- a/mojo/services/public/cpp/view_manager/BUILD.gn +++ b/mojo/services/public/cpp/view_manager/BUILD.gn @@ -7,7 +7,7 @@ source_set("view_manager") { ":common", "//base", "//mojo/public/cpp/application", - "//mojo/public/interfaces/service_provider", + "//mojo/public/interfaces/application", "//mojo/services/public/cpp/geometry", "//mojo/services/public/interfaces/geometry", "//mojo/services/public/interfaces/view_manager", diff --git a/mojo/services/public/cpp/view_manager/lib/view_manager_client_impl.cc b/mojo/services/public/cpp/view_manager/lib/view_manager_client_impl.cc index f76b0be..e7c8a83 100644 --- a/mojo/services/public/cpp/view_manager/lib/view_manager_client_impl.cc +++ b/mojo/services/public/cpp/view_manager/lib/view_manager_client_impl.cc @@ -9,7 +9,6 @@ #include "base/stl_util.h" #include "mojo/public/cpp/application/application_connection.h" #include "mojo/public/cpp/application/connect.h" -#include "mojo/public/interfaces/service_provider/service_provider.mojom.h" #include "mojo/services/public/cpp/view_manager/lib/node_private.h" #include "mojo/services/public/cpp/view_manager/lib/view_private.h" #include "mojo/services/public/cpp/view_manager/node_observer.h" diff --git a/mojo/services/view_manager/root_node_manager.cc b/mojo/services/view_manager/root_node_manager.cc index 1b286e6..2381db7 100644 --- a/mojo/services/view_manager/root_node_manager.cc +++ b/mojo/services/view_manager/root_node_manager.cc @@ -6,7 +6,7 @@ #include "base/logging.h" #include "mojo/public/cpp/application/application_connection.h" -#include "mojo/public/interfaces/service_provider/service_provider.mojom.h" +#include "mojo/public/interfaces/application/service_provider.mojom.h" #include "mojo/services/public/cpp/input_events/input_events_type_converters.h" #include "mojo/services/view_manager/view.h" #include "mojo/services/view_manager/view_manager_service_impl.h" diff --git a/mojo/services/view_manager/view_manager_init_service_impl.cc b/mojo/services/view_manager/view_manager_init_service_impl.cc index 70f8224..a272e13 100644 --- a/mojo/services/view_manager/view_manager_init_service_impl.cc +++ b/mojo/services/view_manager/view_manager_init_service_impl.cc @@ -5,7 +5,6 @@ #include "mojo/services/view_manager/view_manager_init_service_impl.h" #include "base/bind.h" -#include "mojo/public/interfaces/service_provider/service_provider.mojom.h" #include "mojo/services/view_manager/ids.h" #include "mojo/services/view_manager/view_manager_init_service_context.h" #include "mojo/services/view_manager/view_manager_service_impl.h" diff --git a/mojo/shell/BUILD.gn b/mojo/shell/BUILD.gn index fbcbf82..2f6cbdc 100644 --- a/mojo/shell/BUILD.gn +++ b/mojo/shell/BUILD.gn @@ -36,7 +36,7 @@ source_set("lib") { "//mojo/common", "//mojo/gles2", "//mojo/public/cpp/application", - "//mojo/public/interfaces/service_provider", + "//mojo/public/interfaces/application", "//mojo/service_manager", "//mojo/services/native_viewport", "//mojo/services/public/interfaces/native_viewport", diff --git a/mojo/shell/shell_test_helper.h b/mojo/shell/shell_test_helper.h index d675373..e83bf26 100644 --- a/mojo/shell/shell_test_helper.h +++ b/mojo/shell/shell_test_helper.h @@ -8,7 +8,6 @@ #include "base/macros.h" #include "base/memory/scoped_ptr.h" #include "base/run_loop.h" -#include "mojo/public/interfaces/service_provider/service_provider.mojom.h" #include "mojo/service_manager/service_loader.h" #include "mojo/shell/context.h" @@ -21,8 +20,8 @@ class ServiceLoader; namespace shell { // ShellTestHelper is useful for tests to establish a connection to the -// ServiceProvider. Invoke Init() to establish the connection. Once done, -// service_provider() returns the handle to the ServiceProvider. +// ServiceManager. Invoke Init() to establish the connection. Once done, +// service_manager() returns the ServiceManager. class ShellTestHelper { public: ShellTestHelper(); @@ -30,8 +29,6 @@ class ShellTestHelper { void Init(); - // Returns a handle to the ServiceManager. ShellTestHelper owns the - // ServiceProvider. ServiceManager* service_manager() { return context_.service_manager(); } // Sets a ServiceLoader for the specified URL. |loader| is ultimately used on |