diff --git a/BUILD.gn b/BUILD.gn index 6166a8e6fe044c..637ebf368d07e7 100644 --- a/BUILD.gn +++ b/BUILD.gn @@ -701,13 +701,13 @@ group("gn_mojo_targets") { "//media/mojo/interfaces:interfaces_python", "//media/mojo/services:cdm_service", "//media/mojo:tests", + "//mojo/application/public/cpp:test_support_standalone", "//mojo:tests", "//net/interfaces:interfaces_python", "//third_party/mojo/src/mojo/edk/js/test:js_integration_tests", "//third_party/mojo/src/mojo/edk/js/tests:js_to_cpp_bindings_python", "//third_party/mojo/src/mojo/public/python:packaged_application", "//third_party/mojo/src/mojo/public/python:packaged_bindings", - "//third_party/mojo/src/mojo/public/cpp/application:test_support_standalone", "//third_party/mojo_services/src/accessibility/public/interfaces:interfaces_python", ] } diff --git a/components/clipboard/BUILD.gn b/components/clipboard/BUILD.gn index 7440ae62c2fd4d..1973cddc0487ea 100644 --- a/components/clipboard/BUILD.gn +++ b/components/clipboard/BUILD.gn @@ -14,7 +14,7 @@ source_set("lib") { deps = [ "//components/clipboard/public/interfaces", - "//third_party/mojo/src/mojo/public/cpp/application", + "//mojo/application/public/cpp:application", "//third_party/mojo/src/mojo/public/cpp/bindings", ] } diff --git a/components/clipboard/clipboard_application_delegate.cc b/components/clipboard/clipboard_application_delegate.cc index 1f6ab9b8fc9030..ad8fec01d4409a 100644 --- a/components/clipboard/clipboard_application_delegate.cc +++ b/components/clipboard/clipboard_application_delegate.cc @@ -5,7 +5,7 @@ #include "components/clipboard/clipboard_application_delegate.h" #include "components/clipboard/clipboard_standalone_impl.h" -#include "third_party/mojo/src/mojo/public/cpp/application/application_connection.h" +#include "mojo/application/public/cpp/application_connection.h" namespace clipboard { diff --git a/components/clipboard/clipboard_application_delegate.h b/components/clipboard/clipboard_application_delegate.h index fcbb415dc8ee9a..466a02c9ab8c81 100644 --- a/components/clipboard/clipboard_application_delegate.h +++ b/components/clipboard/clipboard_application_delegate.h @@ -7,8 +7,8 @@ #include "base/macros.h" #include "components/clipboard/public/interfaces/clipboard.mojom.h" -#include "third_party/mojo/src/mojo/public/cpp/application/application_delegate.h" -#include "third_party/mojo/src/mojo/public/cpp/application/interface_factory.h" +#include "mojo/application/public/cpp/application_delegate.h" +#include "mojo/application/public/cpp/interface_factory.h" namespace mojo { class ApplicationConnection; diff --git a/components/clipboard/clipboard_apptest.cc b/components/clipboard/clipboard_apptest.cc index da45d2e8b0a386..18a4d07b2aebce 100644 --- a/components/clipboard/clipboard_apptest.cc +++ b/components/clipboard/clipboard_apptest.cc @@ -6,8 +6,8 @@ #include "base/run_loop.h" #include "components/clipboard/public/interfaces/clipboard.mojom.h" #include "mojo/application/application_test_base_chromium.h" +#include "mojo/application/public/cpp/application_impl.h" #include "mojo/common/common_type_converters.h" -#include "third_party/mojo/src/mojo/public/cpp/application/application_impl.h" using mojo::Array; using mojo::Clipboard; diff --git a/components/html_viewer/BUILD.gn b/components/html_viewer/BUILD.gn index e6f55faec199c0..5377e9f9f29aa3 100644 --- a/components/html_viewer/BUILD.gn +++ b/components/html_viewer/BUILD.gn @@ -126,6 +126,7 @@ source_set("lib") { "//media/blink", "//media/mojo", "//mojo/application", + "//mojo/application/public/interfaces", "//mojo/cc", "//mojo/common", "//mojo/converters/surfaces", @@ -135,7 +136,6 @@ source_set("lib") { "//skia", "//third_party/mojo/src/mojo/public/c/system:for_shared_library", "//third_party/mojo/src/mojo/public/cpp/utility", - "//third_party/mojo/src/mojo/public/interfaces/application", "//third_party/mojo_services/src/accessibility/public/interfaces", "//third_party/mojo_services/src/content_handler/public/interfaces", "//ui/mojo/events:interfaces", diff --git a/components/html_viewer/ax_provider_apptest.cc b/components/html_viewer/ax_provider_apptest.cc index 576b89a396a55d..8151e69fef6ba8 100644 --- a/components/html_viewer/ax_provider_apptest.cc +++ b/components/html_viewer/ax_provider_apptest.cc @@ -7,7 +7,7 @@ #include "base/strings/stringprintf.h" #include "base/test/test_timeouts.h" #include "mojo/application/application_test_base_chromium.h" -#include "mojo/public/cpp/application/application_impl.h" +#include "mojo/application/public/cpp/application_impl.h" #include "net/test/spawned_test_server/spawned_test_server.h" #include "testing/gtest/include/gtest/gtest.h" #include "third_party/mojo_services/src/accessibility/public/interfaces/accessibility.mojom.h" diff --git a/components/html_viewer/blink_platform_impl.cc b/components/html_viewer/blink_platform_impl.cc index d7f5bb8fab5ca3..e0ab1c0c843bb8 100644 --- a/components/html_viewer/blink_platform_impl.cc +++ b/components/html_viewer/blink_platform_impl.cc @@ -23,12 +23,12 @@ #include "components/scheduler/child/webthread_impl_for_worker_scheduler.h" #include "components/scheduler/renderer/renderer_scheduler.h" #include "components/scheduler/renderer/webthread_impl_for_renderer_scheduler.h" +#include "mojo/application/public/cpp/application_impl.h" +#include "mojo/application/public/cpp/connect.h" #include "net/base/data_url.h" #include "net/base/net_errors.h" #include "net/base/net_util.h" #include "third_party/WebKit/public/platform/WebWaitableEvent.h" -#include "third_party/mojo/src/mojo/public/cpp/application/application_impl.h" -#include "third_party/mojo/src/mojo/public/cpp/application/connect.h" #include "ui/events/gestures/blink/web_gesture_curve_impl.h" namespace html_viewer { diff --git a/components/html_viewer/html_document.cc b/components/html_viewer/html_document.cc index 6154d34d9fa428..d4c456ba776b47 100644 --- a/components/html_viewer/html_document.cc +++ b/components/html_viewer/html_document.cc @@ -24,6 +24,9 @@ #include "media/blink/webencryptedmediaclient_impl.h" #include "media/cdm/default_cdm_factory.h" #include "media/filters/default_media_permission.h" +#include "mojo/application/public/cpp/application_impl.h" +#include "mojo/application/public/cpp/connect.h" +#include "mojo/application/public/interfaces/shell.mojom.h" #include "skia/ext/refptr.h" #include "third_party/WebKit/public/platform/Platform.h" #include "third_party/WebKit/public/platform/WebHTTPHeaderVisitor.h" @@ -36,10 +39,7 @@ #include "third_party/WebKit/public/web/WebScriptSource.h" #include "third_party/WebKit/public/web/WebSettings.h" #include "third_party/WebKit/public/web/WebView.h" -#include "third_party/mojo/src/mojo/public/cpp/application/application_impl.h" -#include "third_party/mojo/src/mojo/public/cpp/application/connect.h" #include "third_party/mojo/src/mojo/public/cpp/system/data_pipe.h" -#include "third_party/mojo/src/mojo/public/interfaces/application/shell.mojom.h" #include "third_party/skia/include/core/SkCanvas.h" #include "third_party/skia/include/core/SkColor.h" #include "third_party/skia/include/core/SkDevice.h" diff --git a/components/html_viewer/html_document.h b/components/html_viewer/html_document.h index 83b06be309d924..ffd549f2f9eedb 100644 --- a/components/html_viewer/html_document.h +++ b/components/html_viewer/html_document.h @@ -15,15 +15,15 @@ #include "components/view_manager/public/cpp/view_manager_delegate.h" #include "components/view_manager/public/cpp/view_observer.h" #include "mandoline/services/navigation/public/interfaces/navigation.mojom.h" +#include "mojo/application/public/cpp/interface_factory.h" +#include "mojo/application/public/cpp/lazy_interface_ptr.h" +#include "mojo/application/public/cpp/service_provider_impl.h" +#include "mojo/application/public/interfaces/application.mojom.h" #include "mojo/services/network/public/interfaces/url_loader.mojom.h" #include "third_party/WebKit/public/web/WebFrameClient.h" #include "third_party/WebKit/public/web/WebSandboxFlags.h" #include "third_party/WebKit/public/web/WebViewClient.h" -#include "third_party/mojo/src/mojo/public/cpp/application/interface_factory.h" -#include "third_party/mojo/src/mojo/public/cpp/application/lazy_interface_ptr.h" -#include "third_party/mojo/src/mojo/public/cpp/application/service_provider_impl.h" #include "third_party/mojo/src/mojo/public/cpp/bindings/interface_impl.h" -#include "third_party/mojo/src/mojo/public/interfaces/application/application.mojom.h" #include "third_party/mojo_services/src/content_handler/public/interfaces/content_handler.mojom.h" namespace base { diff --git a/components/html_viewer/html_viewer.cc b/components/html_viewer/html_viewer.cc index d9ae92fb04e555..6198e09d6a523d 100644 --- a/components/html_viewer/html_viewer.cc +++ b/components/html_viewer/html_viewer.cc @@ -12,15 +12,15 @@ #include "components/html_viewer/html_document.h" #include "components/html_viewer/setup.h" #include "mojo/application/application_runner_chromium.h" +#include "mojo/application/public/cpp/application_connection.h" +#include "mojo/application/public/cpp/application_delegate.h" +#include "mojo/application/public/cpp/application_impl.h" +#include "mojo/application/public/cpp/connect.h" +#include "mojo/application/public/cpp/interface_factory_impl.h" #include "mojo/common/common_type_converters.h" #include "mojo/services/network/public/interfaces/network_service.mojom.h" #include "third_party/WebKit/public/web/WebKit.h" #include "third_party/mojo/src/mojo/public/c/system/main.h" -#include "third_party/mojo/src/mojo/public/cpp/application/application_connection.h" -#include "third_party/mojo/src/mojo/public/cpp/application/application_delegate.h" -#include "third_party/mojo/src/mojo/public/cpp/application/application_impl.h" -#include "third_party/mojo/src/mojo/public/cpp/application/connect.h" -#include "third_party/mojo/src/mojo/public/cpp/application/interface_factory_impl.h" #include "third_party/mojo/src/mojo/public/cpp/bindings/strong_binding.h" #include "third_party/mojo_services/src/content_handler/public/interfaces/content_handler.mojom.h" diff --git a/components/html_viewer/setup.cc b/components/html_viewer/setup.cc index e49ff72a3b5306..15af0e6fd456d1 100644 --- a/components/html_viewer/setup.cc +++ b/components/html_viewer/setup.cc @@ -12,9 +12,9 @@ #include "components/html_viewer/web_media_player_factory.h" #include "components/scheduler/renderer/renderer_scheduler.h" #include "gin/v8_initializer.h" +#include "mojo/application/public/cpp/application_impl.h" #include "third_party/WebKit/public/web/WebKit.h" #include "third_party/WebKit/public/web/WebRuntimeFeatures.h" -#include "third_party/mojo/src/mojo/public/cpp/application/application_impl.h" #include "ui/base/resource/resource_bundle.h" #include "ui/base/ui_base_paths.h" diff --git a/components/html_viewer/web_media_player_factory.cc b/components/html_viewer/web_media_player_factory.cc index 0de85f3899d254..2898feb4cb85f0 100644 --- a/components/html_viewer/web_media_player_factory.cc +++ b/components/html_viewer/web_media_player_factory.cc @@ -21,8 +21,8 @@ #include "media/mojo/services/mojo_renderer_factory.h" #include "media/renderers/default_renderer_factory.h" #include "media/renderers/gpu_video_accelerator_factories.h" -#include "third_party/mojo/src/mojo/public/cpp/application/connect.h" -#include "third_party/mojo/src/mojo/public/interfaces/application/shell.mojom.h" +#include "mojo/application/public/cpp/connect.h" +#include "mojo/application/public/interfaces/shell.mojom.h" using mojo::ServiceProviderPtr; diff --git a/components/native_viewport/main.cc b/components/native_viewport/main.cc index 1ebfb270df26bc..7cc332366b22b3 100644 --- a/components/native_viewport/main.cc +++ b/components/native_viewport/main.cc @@ -9,12 +9,12 @@ #include "components/native_viewport/native_viewport_impl.h" #include "components/native_viewport/public/cpp/args.h" #include "mojo/application/application_runner_chromium.h" +#include "mojo/application/public/cpp/application_connection.h" +#include "mojo/application/public/cpp/application_delegate.h" +#include "mojo/application/public/cpp/application_impl.h" +#include "mojo/application/public/cpp/interface_factory_impl.h" #include "mojo/common/tracing_impl.h" #include "third_party/mojo/src/mojo/public/c/system/main.h" -#include "third_party/mojo/src/mojo/public/cpp/application/application_connection.h" -#include "third_party/mojo/src/mojo/public/cpp/application/application_delegate.h" -#include "third_party/mojo/src/mojo/public/cpp/application/application_impl.h" -#include "third_party/mojo/src/mojo/public/cpp/application/interface_factory_impl.h" #include "ui/events/event_switches.h" #include "ui/gl/gl_surface.h" diff --git a/components/native_viewport/native_viewport_impl.cc b/components/native_viewport/native_viewport_impl.cc index 2f85500088553d..b1a02fce4c1871 100644 --- a/components/native_viewport/native_viewport_impl.cc +++ b/components/native_viewport/native_viewport_impl.cc @@ -11,8 +11,8 @@ #include "base/time/time.h" #include "components/gles2/gpu_state.h" #include "components/native_viewport/platform_viewport_headless.h" +#include "mojo/application/public/cpp/interface_factory.h" #include "mojo/converters/geometry/geometry_type_converters.h" -#include "third_party/mojo/src/mojo/public/cpp/application/interface_factory.h" #include "ui/events/event.h" namespace native_viewport { diff --git a/components/resource_provider/public/cpp/BUILD.gn b/components/resource_provider/public/cpp/BUILD.gn index 553950c23eed3a..f853cb84db7a84 100644 --- a/components/resource_provider/public/cpp/BUILD.gn +++ b/components/resource_provider/public/cpp/BUILD.gn @@ -14,11 +14,11 @@ source_set("cpp") { deps = [ "../interfaces", "//base", + "//mojo/application/public/cpp:application", + "//mojo/application/public/interfaces", "//mojo/common", "//mojo/platform_handle", - "//third_party/mojo/src/mojo/public/cpp/application", "//third_party/mojo/src/mojo/public/cpp/bindings", "//third_party/mojo/src/mojo/public/cpp/system", - "//third_party/mojo/src/mojo/public/interfaces/application", ] } diff --git a/components/resource_provider/public/cpp/resource_loader.cc b/components/resource_provider/public/cpp/resource_loader.cc index a387e20d3c1408..7f4c9382fefcc6 100644 --- a/components/resource_provider/public/cpp/resource_loader.cc +++ b/components/resource_provider/public/cpp/resource_loader.cc @@ -6,10 +6,10 @@ #include "base/bind.h" #include "base/files/file.h" +#include "mojo/application/public/cpp/connect.h" +#include "mojo/application/public/interfaces/shell.mojom.h" #include "mojo/common/common_type_converters.h" #include "mojo/platform_handle/platform_handle_functions.h" -#include "third_party/mojo/src/mojo/public/cpp/application/connect.h" -#include "third_party/mojo/src/mojo/public/interfaces/application/shell.mojom.h" namespace resource_provider { diff --git a/components/resource_provider/public/cpp/resource_loader.h b/components/resource_provider/public/cpp/resource_loader.h index 1162180619bd05..97f2b2ae3e04ba 100644 --- a/components/resource_provider/public/cpp/resource_loader.h +++ b/components/resource_provider/public/cpp/resource_loader.h @@ -13,10 +13,10 @@ #include "base/basictypes.h" #include "base/memory/scoped_ptr.h" #include "components/resource_provider/public/interfaces/resource_provider.mojom.h" +#include "mojo/application/public/interfaces/service_provider.mojom.h" #include "mojo/platform_handle/platform_handle.h" #include "third_party/mojo/src/mojo/public/cpp/bindings/array.h" #include "third_party/mojo/src/mojo/public/cpp/system/handle.h" -#include "third_party/mojo/src/mojo/public/interfaces/application/service_provider.mojom.h" namespace base { class File; diff --git a/components/resource_provider/public/interfaces/BUILD.gn b/components/resource_provider/public/interfaces/BUILD.gn index 7bf8e85c27f753..d3cb620c19d92b 100644 --- a/components/resource_provider/public/interfaces/BUILD.gn +++ b/components/resource_provider/public/interfaces/BUILD.gn @@ -10,5 +10,7 @@ mojom("interfaces") { "resource_provider.mojom", ] - mojo_sdk_deps = [ "mojo/public/interfaces/application" ] + deps = [ + "//mojo/application/public/interfaces", + ] } diff --git a/components/resource_provider/resource_provider_app.cc b/components/resource_provider/resource_provider_app.cc index 1373d637e28bf3..c9ac5d5231dfa4 100644 --- a/components/resource_provider/resource_provider_app.cc +++ b/components/resource_provider/resource_provider_app.cc @@ -6,7 +6,7 @@ #include "components/resource_provider/file_utils.h" #include "components/resource_provider/resource_provider_impl.h" -#include "third_party/mojo/src/mojo/public/cpp/application/application_connection.h" +#include "mojo/application/public/cpp/application_connection.h" #include "url/gurl.h" namespace resource_provider { diff --git a/components/resource_provider/resource_provider_app.h b/components/resource_provider/resource_provider_app.h index 55bb94099b0816..ac99205afb189f 100644 --- a/components/resource_provider/resource_provider_app.h +++ b/components/resource_provider/resource_provider_app.h @@ -8,9 +8,9 @@ #include #include "components/resource_provider/public/interfaces/resource_provider.mojom.h" +#include "mojo/application/public/cpp/application_delegate.h" +#include "mojo/application/public/cpp/interface_factory.h" #include "mojo/common/weak_binding_set.h" -#include "third_party/mojo/src/mojo/public/cpp/application/application_delegate.h" -#include "third_party/mojo/src/mojo/public/cpp/application/interface_factory.h" #include "third_party/mojo/src/mojo/public/cpp/bindings/binding.h" #include "third_party/mojo/src/mojo/public/cpp/bindings/error_handler.h" diff --git a/components/resource_provider/resource_provider_apptest.cc b/components/resource_provider/resource_provider_apptest.cc index 7853e328b67632..acd62eb080cea5 100644 --- a/components/resource_provider/resource_provider_apptest.cc +++ b/components/resource_provider/resource_provider_apptest.cc @@ -10,11 +10,11 @@ #include "components/resource_provider/public/cpp/resource_loader.h" #include "components/resource_provider/public/interfaces/resource_provider.mojom.h" #include "mojo/application/application_test_base_chromium.h" +#include "mojo/application/public/cpp/application_delegate.h" +#include "mojo/application/public/cpp/application_impl.h" +#include "mojo/application/public/cpp/service_provider_impl.h" #include "mojo/common/common_type_converters.h" #include "mojo/platform_handle/platform_handle_functions.h" -#include "third_party/mojo/src/mojo/public/cpp/application/application_delegate.h" -#include "third_party/mojo/src/mojo/public/cpp/application/application_impl.h" -#include "third_party/mojo/src/mojo/public/cpp/application/service_provider_impl.h" #include "third_party/mojo/src/mojo/public/cpp/bindings/array.h" #include "third_party/mojo/src/mojo/public/cpp/system/macros.h" diff --git a/components/surfaces/surfaces_impl.h b/components/surfaces/surfaces_impl.h index 5ff375d22e152c..ef39234ff1c6c3 100644 --- a/components/surfaces/surfaces_impl.h +++ b/components/surfaces/surfaces_impl.h @@ -11,8 +11,8 @@ #include "components/gpu/public/interfaces/command_buffer.mojom.h" #include "components/gpu/public/interfaces/viewport_parameter_listener.mojom.h" #include "components/surfaces/public/interfaces/surfaces.mojom.h" +#include "mojo/application/public/cpp/application_connection.h" #include "mojo/common/weak_binding_set.h" -#include "third_party/mojo/src/mojo/public/cpp/application/application_connection.h" #include "third_party/mojo/src/mojo/public/cpp/bindings/strong_binding.h" namespace cc { diff --git a/components/surfaces/surfaces_service_application.h b/components/surfaces/surfaces_service_application.h index ba55d0c124e97d..9101c9d10ce962 100644 --- a/components/surfaces/surfaces_service_application.h +++ b/components/surfaces/surfaces_service_application.h @@ -9,9 +9,9 @@ #include "cc/surfaces/surface_manager.h" #include "components/surfaces/public/interfaces/display.mojom.h" #include "components/surfaces/public/interfaces/surfaces.mojom.h" +#include "mojo/application/public/cpp/application_delegate.h" +#include "mojo/application/public/cpp/interface_factory.h" #include "mojo/common/tracing_impl.h" -#include "third_party/mojo/src/mojo/public/cpp/application/application_delegate.h" -#include "third_party/mojo/src/mojo/public/cpp/application/interface_factory.h" namespace mojo { class ApplicationConnection; diff --git a/components/view_manager/BUILD.gn b/components/view_manager/BUILD.gn index 5bc0ae4fe80b16..0bd81f8a50f96e 100644 --- a/components/view_manager/BUILD.gn +++ b/components/view_manager/BUILD.gn @@ -82,6 +82,7 @@ source_set("view_manager_lib") { "//components/view_manager/public/interfaces", "//components/window_manager/public/interfaces", "//mojo/application", + "//mojo/application/public/interfaces", "//mojo/common", "//mojo/common:tracing_impl", "//mojo/converters/geometry", @@ -89,7 +90,6 @@ source_set("view_manager_lib") { "//mojo/converters/surfaces", "//third_party/mojo/src/mojo/public/cpp/bindings:bindings", "//third_party/mojo/src/mojo/public/cpp/bindings:callback", - "//third_party/mojo/src/mojo/public/interfaces/application", "//ui/mojo/geometry:interfaces", "//ui/mojo/events:interfaces", "//ui/gfx", @@ -147,12 +147,12 @@ test("tests") { "//components/view_manager/public/cpp:common", "//components/view_manager/public/interfaces", "//components/window_manager/public/interfaces", + "//mojo/application/public/interfaces", "//mojo/converters/geometry", "//mojo/converters/input_events", "//mojo/environment:chromium", "//third_party/mojo/src/mojo/edk/test:run_all_unittests", "//third_party/mojo/src/mojo/public/cpp/bindings:bindings", - "//third_party/mojo/src/mojo/public/interfaces/application", "//ui/mojo/geometry:interfaces", "//ui/mojo/events:interfaces", "//testing/gtest", diff --git a/components/view_manager/connection_manager.cc b/components/view_manager/connection_manager.cc index 5a9657c2b85e5c..ae88b1a524deae 100644 --- a/components/view_manager/connection_manager.cc +++ b/components/view_manager/connection_manager.cc @@ -13,9 +13,9 @@ #include "components/view_manager/server_view.h" #include "components/view_manager/view_coordinate_conversions.h" #include "components/view_manager/view_manager_service_impl.h" +#include "mojo/application/public/interfaces/service_provider.mojom.h" #include "mojo/converters/geometry/geometry_type_converters.h" #include "mojo/converters/input_events/input_events_type_converters.h" -#include "third_party/mojo/src/mojo/public/interfaces/application/service_provider.mojom.h" using mojo::ConnectionSpecificId; diff --git a/components/view_manager/display_manager.cc b/components/view_manager/display_manager.cc index 716bb825192f45..0155ab28353b6a 100644 --- a/components/view_manager/display_manager.cc +++ b/components/view_manager/display_manager.cc @@ -11,12 +11,12 @@ #include "components/view_manager/connection_manager.h" #include "components/view_manager/server_view.h" #include "components/view_manager/view_coordinate_conversions.h" +#include "mojo/application/public/cpp/application_connection.h" +#include "mojo/application/public/cpp/application_impl.h" #include "mojo/converters/geometry/geometry_type_converters.h" #include "mojo/converters/surfaces/surfaces_type_converters.h" #include "mojo/converters/surfaces/surfaces_utils.h" #include "mojo/converters/transform/transform_type_converters.h" -#include "third_party/mojo/src/mojo/public/cpp/application/application_connection.h" -#include "third_party/mojo/src/mojo/public/cpp/application/application_impl.h" using mojo::Rect; using mojo::Size; diff --git a/components/view_manager/public/cpp/BUILD.gn b/components/view_manager/public/cpp/BUILD.gn index e1bd479312bc24..17133b2b18e782 100644 --- a/components/view_manager/public/cpp/BUILD.gn +++ b/components/view_manager/public/cpp/BUILD.gn @@ -35,6 +35,8 @@ mojo_sdk_source_set("cpp") { "../interfaces", "//components/surfaces/public/interfaces:surface_id", "//components/window_manager/public/interfaces", + "//mojo/application/public/cpp:application", + "//mojo/application/public/interfaces", "//ui/mojo/events:interfaces", "//ui/mojo/geometry:interfaces", "//base", @@ -42,10 +44,8 @@ mojo_sdk_source_set("cpp") { mojo_sdk_deps = [ "mojo/public/c/gles2:headers", - "mojo/public/cpp/application", "mojo/public/cpp/bindings:bindings", "mojo/public/cpp/system", - "mojo/public/interfaces/application", ] } diff --git a/components/view_manager/public/cpp/lib/view.cc b/components/view_manager/public/cpp/lib/view.cc index 1cde9e8464bede..5cdb8c966656d5 100644 --- a/components/view_manager/public/cpp/lib/view.cc +++ b/components/view_manager/public/cpp/lib/view.cc @@ -11,7 +11,7 @@ #include "components/view_manager/public/cpp/lib/view_private.h" #include "components/view_manager/public/cpp/view_observer.h" #include "components/view_manager/public/cpp/view_tracker.h" -#include "third_party/mojo/src/mojo/public/cpp/application/service_provider_impl.h" +#include "mojo/application/public/cpp/service_provider_impl.h" namespace mojo { diff --git a/components/view_manager/public/cpp/lib/view_manager_client_factory.cc b/components/view_manager/public/cpp/lib/view_manager_client_factory.cc index 81eccbcf8555d4..23429157caa16a 100644 --- a/components/view_manager/public/cpp/lib/view_manager_client_factory.cc +++ b/components/view_manager/public/cpp/lib/view_manager_client_factory.cc @@ -5,7 +5,7 @@ #include "components/view_manager/public/cpp/view_manager_client_factory.h" #include "components/view_manager/public/cpp/lib/view_manager_client_impl.h" -#include "third_party/mojo/src/mojo/public/interfaces/application/shell.mojom.h" +#include "mojo/application/public/interfaces/shell.mojom.h" namespace mojo { diff --git a/components/view_manager/public/cpp/lib/view_manager_client_impl.cc b/components/view_manager/public/cpp/lib/view_manager_client_impl.cc index e22b4d7a1a6b08..5938c9a7d02efb 100644 --- a/components/view_manager/public/cpp/lib/view_manager_client_impl.cc +++ b/components/view_manager/public/cpp/lib/view_manager_client_impl.cc @@ -8,11 +8,11 @@ #include "components/view_manager/public/cpp/util.h" #include "components/view_manager/public/cpp/view_manager_delegate.h" #include "components/view_manager/public/cpp/view_observer.h" -#include "third_party/mojo/src/mojo/public/cpp/application/application_impl.h" -#include "third_party/mojo/src/mojo/public/cpp/application/connect.h" -#include "third_party/mojo/src/mojo/public/cpp/application/service_provider_impl.h" -#include "third_party/mojo/src/mojo/public/interfaces/application/service_provider.mojom.h" -#include "third_party/mojo/src/mojo/public/interfaces/application/shell.mojom.h" +#include "mojo/application/public/cpp/application_impl.h" +#include "mojo/application/public/cpp/connect.h" +#include "mojo/application/public/cpp/service_provider_impl.h" +#include "mojo/application/public/interfaces/service_provider.mojom.h" +#include "mojo/application/public/interfaces/shell.mojom.h" namespace mojo { diff --git a/components/view_manager/public/cpp/lib/view_manager_context.cc b/components/view_manager/public/cpp/lib/view_manager_context.cc index f1fdd4f2d0484b..1f0e87885fbe61 100644 --- a/components/view_manager/public/cpp/lib/view_manager_context.cc +++ b/components/view_manager/public/cpp/lib/view_manager_context.cc @@ -5,7 +5,7 @@ #include "components/view_manager/public/cpp/view_manager_context.h" #include "components/window_manager/public/interfaces/window_manager.mojom.h" -#include "third_party/mojo/src/mojo/public/cpp/application/application_impl.h" +#include "mojo/application/public/cpp/application_impl.h" #include "third_party/mojo/src/mojo/public/cpp/bindings/interface_request.h" namespace mojo { diff --git a/components/view_manager/public/cpp/tests/BUILD.gn b/components/view_manager/public/cpp/tests/BUILD.gn index 393b0e299355c0..c5a8680983fa16 100644 --- a/components/view_manager/public/cpp/tests/BUILD.gn +++ b/components/view_manager/public/cpp/tests/BUILD.gn @@ -20,9 +20,9 @@ test("mojo_view_manager_lib_unittests") { # TODO(vtl): These non-public deps are illegal here. This should be # converted to an apptest. "//mojo/application", + "//mojo/application/public/cpp:application", "//mojo/edk/system", "//mojo/environment:chromium", - "//mojo/public/cpp/application", "//mojo/public/cpp/system", "//mojo/services/geometry/public/cpp", "//mojo/services/geometry/public/interfaces", diff --git a/components/view_manager/public/cpp/view.h b/components/view_manager/public/cpp/view.h index e2e81cf9e10ddc..cbf9e7880d0197 100644 --- a/components/view_manager/public/cpp/view.h +++ b/components/view_manager/public/cpp/view.h @@ -13,9 +13,9 @@ #include "components/view_manager/public/cpp/types.h" #include "components/view_manager/public/interfaces/view_manager.mojom.h" #include "components/view_manager/public/interfaces/view_manager_constants.mojom.h" +#include "mojo/application/public/interfaces/service_provider.mojom.h" #include "third_party/mojo/src/mojo/public/cpp/bindings/array.h" #include "third_party/mojo/src/mojo/public/cpp/system/macros.h" -#include "third_party/mojo/src/mojo/public/interfaces/application/service_provider.mojom.h" #include "ui/mojo/geometry/geometry.mojom.h" namespace mojo { diff --git a/components/view_manager/public/cpp/view_manager_client_factory.h b/components/view_manager/public/cpp/view_manager_client_factory.h index eaf42a49bcd42f..0fdfb4068c7e67 100644 --- a/components/view_manager/public/cpp/view_manager_client_factory.h +++ b/components/view_manager/public/cpp/view_manager_client_factory.h @@ -6,7 +6,7 @@ #define COMPONENTS_VIEW_MANAGER_PUBLIC_CPP_VIEW_MANAGER_CLIENT_FACTORY_H_ #include "components/view_manager/public/interfaces/view_manager.mojom.h" -#include "third_party/mojo/src/mojo/public/cpp/application/interface_factory.h" +#include "mojo/application/public/cpp/interface_factory.h" namespace mojo { diff --git a/components/view_manager/public/cpp/view_manager_context.h b/components/view_manager/public/cpp/view_manager_context.h index 09b1ce3868b524..c24d0991214d25 100644 --- a/components/view_manager/public/cpp/view_manager_context.h +++ b/components/view_manager/public/cpp/view_manager_context.h @@ -8,7 +8,7 @@ #include #include -#include "third_party/mojo/src/mojo/public/cpp/application/service_provider_impl.h" +#include "mojo/application/public/cpp/service_provider_impl.h" #include "third_party/mojo/src/mojo/public/cpp/system/macros.h" namespace mojo { diff --git a/components/view_manager/public/cpp/view_manager_delegate.h b/components/view_manager/public/cpp/view_manager_delegate.h index 738502f1d12605..be252ce60410d5 100644 --- a/components/view_manager/public/cpp/view_manager_delegate.h +++ b/components/view_manager/public/cpp/view_manager_delegate.h @@ -7,7 +7,7 @@ #include -#include "third_party/mojo/src/mojo/public/interfaces/application/service_provider.mojom.h" +#include "mojo/application/public/interfaces/service_provider.mojom.h" namespace mojo { diff --git a/components/view_manager/public/interfaces/BUILD.gn b/components/view_manager/public/interfaces/BUILD.gn index 982c3637dc5443..f17b2e04ade000 100644 --- a/components/view_manager/public/interfaces/BUILD.gn +++ b/components/view_manager/public/interfaces/BUILD.gn @@ -14,11 +14,10 @@ mojom("interfaces") { import_dirs = [ get_path_info("../../../..", "abspath") ] - mojo_sdk_deps = [ "mojo/public/interfaces/application" ] - deps = [ "//components/native_viewport/public/interfaces", "//components/surfaces/public/interfaces:surface_id", + "//mojo/application/public/interfaces", "//ui/mojo/events:interfaces", "//ui/mojo/geometry:interfaces", ] diff --git a/components/view_manager/public/interfaces/view_manager.mojom b/components/view_manager/public/interfaces/view_manager.mojom index cb02ea6b07c1bf..0dcd7dfa858111 100644 --- a/components/view_manager/public/interfaces/view_manager.mojom +++ b/components/view_manager/public/interfaces/view_manager.mojom @@ -7,7 +7,7 @@ module mojo; import "components/native_viewport/public/interfaces/native_viewport.mojom"; import "components/surfaces/public/interfaces/surface_id.mojom"; import "components/view_manager/public/interfaces/view_manager_constants.mojom"; -import "mojo/public/interfaces/application/service_provider.mojom"; +import "mojo/application/public/interfaces/service_provider.mojom"; import "ui/mojo/events/input_events.mojom"; import "ui/mojo/geometry/geometry.mojom"; diff --git a/components/view_manager/view_manager_app.cc b/components/view_manager/view_manager_app.cc index a068d2a48bb09a..eb5fceb2e4b28a 100644 --- a/components/view_manager/view_manager_app.cc +++ b/components/view_manager/view_manager_app.cc @@ -9,10 +9,10 @@ #include "components/view_manager/display_manager.h" #include "components/view_manager/view_manager_service_impl.h" #include "mojo/application/application_runner_chromium.h" +#include "mojo/application/public/cpp/application_connection.h" +#include "mojo/application/public/cpp/application_impl.h" #include "mojo/common/tracing_impl.h" #include "third_party/mojo/src/mojo/public/c/system/main.h" -#include "third_party/mojo/src/mojo/public/cpp/application/application_connection.h" -#include "third_party/mojo/src/mojo/public/cpp/application/application_impl.h" using mojo::ApplicationConnection; using mojo::ApplicationImpl; diff --git a/components/view_manager/view_manager_app.h b/components/view_manager/view_manager_app.h index fc16a0ce66cc22..ebf66459a05b04 100644 --- a/components/view_manager/view_manager_app.h +++ b/components/view_manager/view_manager_app.h @@ -9,9 +9,9 @@ #include "components/view_manager/connection_manager_delegate.h" #include "components/view_manager/public/interfaces/view_manager.mojom.h" #include "components/window_manager/public/interfaces/window_manager_internal.mojom.h" +#include "mojo/application/public/cpp/application_delegate.h" +#include "mojo/application/public/cpp/interface_factory.h" #include "mojo/common/tracing_impl.h" -#include "third_party/mojo/src/mojo/public/cpp/application/application_delegate.h" -#include "third_party/mojo/src/mojo/public/cpp/application/interface_factory.h" #include "third_party/mojo/src/mojo/public/cpp/bindings/binding.h" #include "third_party/mojo/src/mojo/public/cpp/bindings/error_handler.h" diff --git a/components/view_manager/view_manager_client_apptest.cc b/components/view_manager/view_manager_client_apptest.cc index 0002b9fbe56f62..54a335bca4b6f0 100644 --- a/components/view_manager/view_manager_client_apptest.cc +++ b/components/view_manager/view_manager_client_apptest.cc @@ -17,10 +17,10 @@ #include "components/view_manager/public/cpp/view_manager_delegate.h" #include "components/view_manager/public/cpp/view_observer.h" #include "mojo/application/application_test_base_chromium.h" -#include "third_party/mojo/src/mojo/public/cpp/application/application_connection.h" -#include "third_party/mojo/src/mojo/public/cpp/application/application_delegate.h" -#include "third_party/mojo/src/mojo/public/cpp/application/application_impl.h" -#include "third_party/mojo/src/mojo/public/cpp/application/service_provider_impl.h" +#include "mojo/application/public/cpp/application_connection.h" +#include "mojo/application/public/cpp/application_delegate.h" +#include "mojo/application/public/cpp/application_impl.h" +#include "mojo/application/public/cpp/service_provider_impl.h" #include "ui/mojo/geometry/geometry_util.h" namespace mojo { diff --git a/components/view_manager/view_manager_service_apptest.cc b/components/view_manager/view_manager_service_apptest.cc index bb533c729b4503..d43804300551f8 100644 --- a/components/view_manager/view_manager_service_apptest.cc +++ b/components/view_manager/view_manager_service_apptest.cc @@ -11,8 +11,8 @@ #include "components/window_manager/public/interfaces/window_manager.mojom.h" #include "components/window_manager/public/interfaces/window_manager_internal.mojom.h" #include "mojo/application/application_test_base_chromium.h" -#include "third_party/mojo/src/mojo/public/cpp/application/application_delegate.h" -#include "third_party/mojo/src/mojo/public/cpp/application/application_impl.h" +#include "mojo/application/public/cpp/application_delegate.h" +#include "mojo/application/public/cpp/application_impl.h" using mojo::ApplicationConnection; using mojo::ApplicationDelegate; diff --git a/components/view_manager/view_manager_service_unittest.cc b/components/view_manager/view_manager_service_unittest.cc index 43274bea947bd0..1e06be68033f92 100644 --- a/components/view_manager/view_manager_service_unittest.cc +++ b/components/view_manager/view_manager_service_unittest.cc @@ -19,9 +19,9 @@ #include "components/view_manager/view_manager_service_impl.h" #include "components/window_manager/public/interfaces/window_manager.mojom.h" #include "components/window_manager/public/interfaces/window_manager_internal.mojom.h" +#include "mojo/application/public/interfaces/service_provider.mojom.h" #include "mojo/converters/geometry/geometry_type_converters.h" #include "testing/gtest/include/gtest/gtest.h" -#include "third_party/mojo/src/mojo/public/interfaces/application/service_provider.mojom.h" #include "ui/gfx/geometry/rect.h" using mojo::Array; diff --git a/components/window_manager/BUILD.gn b/components/window_manager/BUILD.gn index e92bb6aa553cec..e39e89f8b61238 100644 --- a/components/window_manager/BUILD.gn +++ b/components/window_manager/BUILD.gn @@ -20,10 +20,10 @@ source_set("lib") { "//components/view_manager/public/cpp", "//components/window_manager/public/interfaces", "//mojo/application", + "//mojo/application/public/interfaces", "//mojo/common", "//mojo/converters/geometry", "//third_party/mojo/src/mojo/public/cpp/bindings:bindings", - "//third_party/mojo/src/mojo/public/interfaces/application", "//ui/gfx/geometry", "//ui/mojo/events:interfaces", ] diff --git a/components/window_manager/main.cc b/components/window_manager/main.cc index 5f500264b8d634..9efd4c56167a39 100644 --- a/components/window_manager/main.cc +++ b/components/window_manager/main.cc @@ -8,10 +8,10 @@ #include "components/window_manager/window_manager_app.h" #include "components/window_manager/window_manager_delegate.h" #include "mojo/application/application_runner_chromium.h" +#include "mojo/application/public/cpp/application_delegate.h" +#include "mojo/application/public/cpp/service_provider_impl.h" #include "mojo/common/tracing_impl.h" #include "third_party/mojo/src/mojo/public/c/system/main.h" -#include "third_party/mojo/src/mojo/public/cpp/application/application_delegate.h" -#include "third_party/mojo/src/mojo/public/cpp/application/service_provider_impl.h" // ApplicationDelegate implementation file for WindowManager users (e.g. // core window manager tests) that do not want to provide their own diff --git a/components/window_manager/public/interfaces/BUILD.gn b/components/window_manager/public/interfaces/BUILD.gn index 9d1df9e9b5dff5..5d4aa670743636 100644 --- a/components/window_manager/public/interfaces/BUILD.gn +++ b/components/window_manager/public/interfaces/BUILD.gn @@ -11,9 +11,8 @@ mojom("interfaces") { "window_manager_internal.mojom", ] - mojo_sdk_deps = [ "mojo/public/interfaces/application" ] - deps = [ + "//mojo/application/public/interfaces", "//ui/mojo/events:interfaces", "//ui/mojo/geometry:interfaces", ] diff --git a/components/window_manager/public/interfaces/window_manager.mojom b/components/window_manager/public/interfaces/window_manager.mojom index 0ff82feea18f77..eb372242249bcb 100644 --- a/components/window_manager/public/interfaces/window_manager.mojom +++ b/components/window_manager/public/interfaces/window_manager.mojom @@ -4,7 +4,7 @@ module mojo; -import "mojo/public/interfaces/application/service_provider.mojom"; +import "mojo/application/public/interfaces/service_provider.mojom"; interface WindowManager { // Requests the WindowManager to embed the app for |url| at an appropriate diff --git a/components/window_manager/window_manager_app.cc b/components/window_manager/window_manager_app.cc index da40ef777090ad..57a4fecf9a329f 100644 --- a/components/window_manager/window_manager_app.cc +++ b/components/window_manager/window_manager_app.cc @@ -9,10 +9,10 @@ #include "components/view_manager/public/cpp/view.h" #include "components/view_manager/public/cpp/view_manager.h" #include "components/window_manager/window_manager_delegate.h" +#include "mojo/application/public/cpp/application_connection.h" +#include "mojo/application/public/cpp/application_impl.h" +#include "mojo/application/public/interfaces/shell.mojom.h" #include "mojo/converters/geometry/geometry_type_converters.h" -#include "third_party/mojo/src/mojo/public/cpp/application/application_connection.h" -#include "third_party/mojo/src/mojo/public/cpp/application/application_impl.h" -#include "third_party/mojo/src/mojo/public/interfaces/application/shell.mojom.h" using mojo::ApplicationConnection; using mojo::Id; diff --git a/components/window_manager/window_manager_app.h b/components/window_manager/window_manager_app.h index 81a2e4633b3ef7..8b2d89fe746d44 100644 --- a/components/window_manager/window_manager_app.h +++ b/components/window_manager/window_manager_app.h @@ -15,8 +15,8 @@ #include "components/view_manager/public/cpp/view_observer.h" #include "components/window_manager/public/interfaces/window_manager_internal.mojom.h" #include "components/window_manager/window_manager_impl.h" -#include "third_party/mojo/src/mojo/public/cpp/application/application_delegate.h" -#include "third_party/mojo/src/mojo/public/cpp/application/interface_factory_impl.h" +#include "mojo/application/public/cpp/application_delegate.h" +#include "mojo/application/public/cpp/interface_factory_impl.h" #include "third_party/mojo/src/mojo/public/cpp/bindings/binding.h" #include "third_party/mojo/src/mojo/public/cpp/bindings/string.h" #include "ui/mojo/events/input_events.mojom.h" diff --git a/components/window_manager/window_manager_apptest.cc b/components/window_manager/window_manager_apptest.cc index f7915fdcd17c73..0e9cc754d67e9b 100644 --- a/components/window_manager/window_manager_apptest.cc +++ b/components/window_manager/window_manager_apptest.cc @@ -9,9 +9,9 @@ #include "components/view_manager/public/cpp/view_manager_delegate.h" #include "components/window_manager/public/interfaces/window_manager.mojom.h" #include "mojo/application/application_test_base_chromium.h" -#include "third_party/mojo/src/mojo/public/cpp/application/application_delegate.h" -#include "third_party/mojo/src/mojo/public/cpp/application/application_impl.h" -#include "third_party/mojo/src/mojo/public/cpp/application/service_provider_impl.h" +#include "mojo/application/public/cpp/application_delegate.h" +#include "mojo/application/public/cpp/application_impl.h" +#include "mojo/application/public/cpp/service_provider_impl.h" #include "third_party/mojo/src/mojo/public/cpp/system/macros.h" namespace mojo { diff --git a/components/window_manager/window_manager_delegate.h b/components/window_manager/window_manager_delegate.h index 71e154ceab1b63..1ea7923bf27833 100644 --- a/components/window_manager/window_manager_delegate.h +++ b/components/window_manager/window_manager_delegate.h @@ -5,8 +5,8 @@ #ifndef COMPONENTS_WINDOW_MANAGER_WINDOW_MANAGER_DELEGATE_H_ #define COMPONENTS_WINDOW_MANAGER_WINDOW_MANAGER_DELEGATE_H_ +#include "mojo/application/public/interfaces/service_provider.mojom.h" #include "third_party/mojo/src/mojo/public/cpp/bindings/string.h" -#include "third_party/mojo/src/mojo/public/interfaces/application/service_provider.mojom.h" #include "ui/mojo/events/input_events.mojom.h" #include "ui/mojo/events/input_key_codes.mojom.h" diff --git a/content/app/BUILD.gn b/content/app/BUILD.gn index 6aae69649839c7..463d9f18b4dd15 100644 --- a/content/app/BUILD.gn +++ b/content/app/BUILD.gn @@ -61,9 +61,9 @@ if (is_ios) { ] } else { content_app_deps += [ + "//mojo/application/public/interfaces", "//mojo/environment:chromium", "//third_party/mojo/src/mojo/edk/system", - "//third_party/mojo/src/mojo/public/interfaces/application", ] } diff --git a/content/browser/BUILD.gn b/content/browser/BUILD.gn index 774a961894559f..59c64c537db1d7 100644 --- a/content/browser/BUILD.gn +++ b/content/browser/BUILD.gn @@ -108,6 +108,7 @@ source_set("browser") { "//content/common:mojo_bindings", "//content/public/common:mojo_bindings", "//device/bluetooth", + "//mojo/application/public/interfaces", "//storage/browser", "//storage/common", "//third_party/WebKit/public:image_resources", @@ -117,7 +118,6 @@ source_set("browser") { "//third_party/leveldatabase", "//third_party/libyuv", "//third_party/mojo/src/mojo/public/cpp/bindings", - "//third_party/mojo/src/mojo/public/interfaces/application", "//third_party/mojo/src/mojo/public/js", "//ui/events/blink", "//ui/resources", diff --git a/content/child/BUILD.gn b/content/child/BUILD.gn index 346b7bbb0bc1f9..4bbcb9262b5346 100644 --- a/content/child/BUILD.gn +++ b/content/child/BUILD.gn @@ -26,11 +26,11 @@ source_set("child") { "//components/tracing", "//components/webcrypto", "//content/common:mojo_bindings", + "//mojo/application/public/interfaces", "//mojo/common", "//mojo/environment:chromium", "//skia", "//third_party/icu", - "//third_party/mojo/src/mojo/public/interfaces/application", "//ui/base", "//ui/events/gestures/blink", "//ui/gfx", diff --git a/content/common/BUILD.gn b/content/common/BUILD.gn index 25627f1d1cc6b2..ecfe362c95bd94 100644 --- a/content/common/BUILD.gn +++ b/content/common/BUILD.gn @@ -179,12 +179,12 @@ source_set("common") { "//media", "//media/midi", "//media:shared_memory_support", + "//mojo/application/public/interfaces", "//mojo/environment:chromium", "//sandbox", "//storage/common", "//third_party/WebKit/public:blink", "//third_party/mojo/src/mojo/edk/system", - "//third_party/mojo/src/mojo/public/interfaces/application", "//ui/gl", ] } @@ -491,6 +491,6 @@ mojom("mojo_bindings") { deps = [ "//content/public/common:mojo_bindings", - "//third_party/mojo/src/mojo/public/interfaces/application:application", + "//mojo/application/public/interfaces", ] } diff --git a/content/common/application_setup.mojom b/content/common/application_setup.mojom index 4e094a0e96471b..1005663cd9afa1 100644 --- a/content/common/application_setup.mojom +++ b/content/common/application_setup.mojom @@ -4,7 +4,7 @@ module content; -import "third_party/mojo/src/mojo/public/interfaces/application/service_provider.mojom"; +import "mojo/application/public/interfaces/service_provider.mojom"; interface ApplicationSetup { ExchangeServiceProviders(mojo.ServiceProvider& services, diff --git a/content/common/mojo/DEPS b/content/common/mojo/DEPS new file mode 100644 index 00000000000000..c6b01113ba2ae5 --- /dev/null +++ b/content/common/mojo/DEPS @@ -0,0 +1,3 @@ +include_rules = [ + "+mojo/application/public/interfaces", +] diff --git a/content/common/mojo/service_registry_impl.h b/content/common/mojo/service_registry_impl.h index 13aba813f6bb19..5cdd322606338c 100644 --- a/content/common/mojo/service_registry_impl.h +++ b/content/common/mojo/service_registry_impl.h @@ -14,9 +14,9 @@ #include "base/compiler_specific.h" #include "base/memory/weak_ptr.h" #include "content/public/common/service_registry.h" +#include "mojo/application/public/interfaces/service_provider.mojom.h" #include "third_party/mojo/src/mojo/public/cpp/bindings/binding.h" #include "third_party/mojo/src/mojo/public/cpp/system/core.h" -#include "third_party/mojo/src/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 fcf893673e0a15..b32f95327036ed 100644 --- a/content/common/render_frame_setup.mojom +++ b/content/common/render_frame_setup.mojom @@ -4,7 +4,7 @@ module content; -import "third_party/mojo/src/mojo/public/interfaces/application/service_provider.mojom"; +import "mojo/application/public/interfaces/service_provider.mojom"; interface RenderFrameSetup { ExchangeServiceProviders(int32 frame_routing_id, diff --git a/content/content.gyp b/content/content.gyp index 5e69aff26af29e..0125b2c8c7f2d2 100644 --- a/content/content.gyp +++ b/content/content.gyp @@ -432,9 +432,9 @@ '../device/bluetooth/bluetooth.gyp:device_bluetooth_java', '../device/vibration/vibration.gyp:device_vibration_java', '../media/media.gyp:media_java', + '../mojo/mojo_base.gyp:mojo_application_bindings', '../mojo/mojo_base.gyp:mojo_system_java', '../net/net.gyp:net', - '../third_party/mojo/mojo_public.gyp:mojo_application_bindings', '../third_party/mojo/mojo_public.gyp:mojo_bindings_java', '../ui/android/ui_android.gyp:ui_java', '../ui/touch_selection/ui_touch_selection.gyp:selection_event_type_java', diff --git a/content/content_common.gypi b/content/content_common.gypi index e4b952dd3aac47..c19df690c50df8 100644 --- a/content/content_common.gypi +++ b/content/content_common.gypi @@ -597,16 +597,16 @@ '../media/media.gyp:media', '../media/media.gyp:shared_memory_support', '../media/midi/midi.gyp:midi', + '../mojo/mojo_base.gyp:mojo_application_bindings', '../mojo/mojo_base.gyp:mojo_environment_chromium', '../storage/storage_common.gyp:storage_common', '../third_party/WebKit/public/blink.gyp:blink', '../third_party/mojo/mojo_edk.gyp:mojo_system_impl', - '../third_party/mojo/mojo_public.gyp:mojo_application_bindings', '../third_party/mojo/mojo_public.gyp:mojo_cpp_bindings', '../ui/gl/gl.gyp:gl', ], 'export_dependent_settings' : [ - '../third_party/mojo/mojo_public.gyp:mojo_application_bindings', + '../mojo/mojo_base.gyp:mojo_application_bindings', '../third_party/mojo/mojo_public.gyp:mojo_cpp_bindings', ], 'actions': [ diff --git a/content/content_common_mojo_bindings.gyp b/content/content_common_mojo_bindings.gyp index e83a35b8fd535a..dc2df70ef9eb03 100644 --- a/content/content_common_mojo_bindings.gyp +++ b/content/content_common_mojo_bindings.gyp @@ -33,8 +33,8 @@ 'variables': { 'enable_wexit_time_destructors': 1, }, 'dependencies': [ 'content_common_mojo_bindings_mojom', + '../mojo/mojo_base.gyp:mojo_application_bindings', '../mojo/mojo_base.gyp:mojo_environment_chromium', - '../third_party/mojo/mojo_public.gyp:mojo_application_bindings', '../third_party/mojo/mojo_public.gyp:mojo_cpp_bindings', ] }, diff --git a/content/gpu/BUILD.gn b/content/gpu/BUILD.gn index 5ef0014e587f38..2f5d1133244fd8 100644 --- a/content/gpu/BUILD.gn +++ b/content/gpu/BUILD.gn @@ -41,8 +41,8 @@ source_set("gpu_sources") { "//base", "//content:export", "//content/public/child:child_sources", + "//mojo/application/public/interfaces", "//skia", - "//third_party/mojo/src/mojo/public/interfaces/application", "//ui/gl", ] diff --git a/content/plugin/BUILD.gn b/content/plugin/BUILD.gn index cb1bc182ba1437..884a86496681e6 100644 --- a/content/plugin/BUILD.gn +++ b/content/plugin/BUILD.gn @@ -32,8 +32,8 @@ if (enable_plugins && !is_linux) { deps = [ "//content:export", + "//mojo/application/public/interfaces", "//skia", - "//third_party/mojo/src/mojo/public/interfaces/application", "//third_party/npapi", "//third_party/WebKit/public:blink", ] diff --git a/content/ppapi_plugin/BUILD.gn b/content/ppapi_plugin/BUILD.gn index b4a6704e125f85..ef4dcdf5976eb4 100644 --- a/content/ppapi_plugin/BUILD.gn +++ b/content/ppapi_plugin/BUILD.gn @@ -39,11 +39,11 @@ source_set("ppapi_plugin_sources") { "//content:export", "//content/public/child:child_sources", "//content/public/common:common_sources", + "//mojo/application/public/interfaces", "//ppapi/proxy:ipc", "//skia", "//third_party/icu", "//third_party/WebKit/public:blink", - "//third_party/mojo/src/mojo/public/interfaces/application", "//ui/base", "//ui/gfx", "//ui/gfx/geometry", diff --git a/content/renderer/BUILD.gn b/content/renderer/BUILD.gn index c23667b7459ad0..bba336d7eb7dd1 100644 --- a/content/renderer/BUILD.gn +++ b/content/renderer/BUILD.gn @@ -42,6 +42,7 @@ source_set("renderer") { "//jingle:jingle_glue", "//media", "//media/blink", + "//mojo/application/public/interfaces", "//mojo/environment:chromium", "//net", "//skia", @@ -50,7 +51,6 @@ source_set("renderer") { "//third_party/libjingle", "//third_party/mojo/src/mojo/edk/js", "//third_party/mojo/src/mojo/public/js", - "//third_party/mojo/src/mojo/public/interfaces/application", "//third_party/npapi", "//third_party/WebKit/public:blink", "//third_party/widevine/cdm:version_h", diff --git a/content/utility/BUILD.gn b/content/utility/BUILD.gn index d98d63921c162a..7a8f4acc31469e 100644 --- a/content/utility/BUILD.gn +++ b/content/utility/BUILD.gn @@ -27,7 +27,7 @@ source_set("utility") { "//content/public/child:child_sources", "//content/public/common:common_sources", "//courgette:courgette_lib", + "//mojo/application/public/interfaces", "//third_party/WebKit/public:blink_headers", - "//third_party/mojo/src/mojo/public/interfaces/application", ] } diff --git a/extensions/BUILD.gn b/extensions/BUILD.gn index 903bb9c9fd7501..8cfaea5301d498 100644 --- a/extensions/BUILD.gn +++ b/extensions/BUILD.gn @@ -161,6 +161,7 @@ test("extensions_unittests") { "//extensions/renderer", "//extensions/strings", "//extensions/utility", + "//mojo/application/public/interfaces", "//mojo/environment:chromium", "//testing/gmock", "//testing/gtest", @@ -168,7 +169,6 @@ test("extensions_unittests") { "//third_party/mojo/src/mojo/edk/js", "//third_party/mojo/src/mojo/edk/system", "//third_party/mojo/src/mojo/public/cpp/bindings", - "//third_party/mojo/src/mojo/public/interfaces/application", ] if (is_win) { diff --git a/extensions/browser/mojo/DEPS b/extensions/browser/mojo/DEPS new file mode 100644 index 00000000000000..c6b01113ba2ae5 --- /dev/null +++ b/extensions/browser/mojo/DEPS @@ -0,0 +1,3 @@ +include_rules = [ + "+mojo/application/public/interfaces", +] diff --git a/extensions/browser/mojo/stash_backend_unittest.cc b/extensions/browser/mojo/stash_backend_unittest.cc index de8abf440c9ec2..ae142085413b71 100644 --- a/extensions/browser/mojo/stash_backend_unittest.cc +++ b/extensions/browser/mojo/stash_backend_unittest.cc @@ -6,8 +6,8 @@ #include "base/message_loop/message_loop.h" #include "base/run_loop.h" #include "extensions/browser/mojo/stash_backend.h" +#include "mojo/application/public/interfaces/service_provider.mojom.h" #include "testing/gtest/include/gtest/gtest.h" -#include "third_party/mojo/src/mojo/public/interfaces/application/service_provider.mojom.h" namespace extensions { namespace { diff --git a/extensions/extensions_tests.gyp b/extensions/extensions_tests.gyp index 318bc2f1ab69a2..3e895ca040732e 100644 --- a/extensions/extensions_tests.gyp +++ b/extensions/extensions_tests.gyp @@ -23,6 +23,7 @@ '../device/bluetooth/bluetooth.gyp:device_bluetooth_mocks', '../device/serial/serial.gyp:device_serial', '../device/serial/serial.gyp:device_serial_test_util', + '../mojo/mojo_base.gyp:mojo_application_bindings', '../mojo/mojo_base.gyp:mojo_environment_chromium', '../testing/gmock.gyp:gmock', '../testing/gtest.gyp:gtest', @@ -30,7 +31,6 @@ '../third_party/mojo/mojo_edk.gyp:mojo_js_lib', '../third_party/mojo/mojo_edk.gyp:mojo_system_impl', '../third_party/mojo/mojo_public.gyp:mojo_cpp_bindings', - '../third_party/mojo/mojo_public.gyp:mojo_application_bindings', 'common/api/api.gyp:cast_channel_proto', 'extensions.gyp:extensions_browser', 'extensions.gyp:extensions_common', diff --git a/mandoline/services/core_services/BUILD.gn b/mandoline/services/core_services/BUILD.gn index 13a97d02cc8b19..4bc6c9ece8858c 100644 --- a/mandoline/services/core_services/BUILD.gn +++ b/mandoline/services/core_services/BUILD.gn @@ -65,12 +65,12 @@ source_set("sources") { "//components/view_manager:view_manager_lib", "//mandoline/ui/browser:kiosk_wm_lib", "//mojo/application", + "//mojo/application/public/interfaces", "//mojo/common", "//mojo/common:tracing_impl", "//mojo/environment:chromium", "//mojo/services/network:lib", "//mojo/services/tracing:lib", - "//third_party/mojo/src/mojo/public/interfaces/application", "//third_party/mojo/src/mojo/public/cpp/bindings:bindings", "//third_party/mojo_services/src/content_handler/public/interfaces", ] diff --git a/mandoline/services/core_services/core_services_application_delegate.cc b/mandoline/services/core_services/core_services_application_delegate.cc index 67830220246470..90e9314d1e6dd5 100644 --- a/mandoline/services/core_services/core_services_application_delegate.cc +++ b/mandoline/services/core_services/core_services_application_delegate.cc @@ -10,10 +10,10 @@ #include "components/surfaces/surfaces_service_application.h" #include "components/view_manager/view_manager_app.h" #include "mandoline/ui/browser/browser.h" +#include "mojo/application/public/cpp/application_connection.h" +#include "mojo/application/public/cpp/application_impl.h" #include "mojo/common/message_pump_mojo.h" #include "mojo/services/tracing/tracing_app.h" -#include "third_party/mojo/src/mojo/public/cpp/application/application_connection.h" -#include "third_party/mojo/src/mojo/public/cpp/application/application_impl.h" #include "url/gurl.h" #if !defined(OS_ANDROID) diff --git a/mandoline/services/core_services/core_services_application_delegate.h b/mandoline/services/core_services/core_services_application_delegate.h index 62cd7847118882..8d62fdcc263644 100644 --- a/mandoline/services/core_services/core_services_application_delegate.h +++ b/mandoline/services/core_services/core_services_application_delegate.h @@ -9,9 +9,9 @@ #include "base/memory/scoped_vector.h" #include "base/threading/thread.h" #include "components/clipboard/public/interfaces/clipboard.mojom.h" +#include "mojo/application/public/cpp/application_delegate.h" +#include "mojo/application/public/cpp/interface_factory_impl.h" #include "mojo/common/weak_binding_set.h" -#include "third_party/mojo/src/mojo/public/cpp/application/application_delegate.h" -#include "third_party/mojo/src/mojo/public/cpp/application/interface_factory_impl.h" #include "third_party/mojo_services/src/content_handler/public/interfaces/content_handler.mojom.h" namespace core_services { diff --git a/mandoline/ui/aura/BUILD.gn b/mandoline/ui/aura/BUILD.gn index 25b6195dc1a516..a3c74235aa0d9f 100644 --- a/mandoline/ui/aura/BUILD.gn +++ b/mandoline/ui/aura/BUILD.gn @@ -35,13 +35,13 @@ source_set("aura") { "//components/surfaces/public/interfaces", "//components/view_manager/public/cpp", "//skia", + "//mojo/application/public/cpp:application", + "//mojo/application/public/interfaces", "//mojo/cc", "//mojo/converters/geometry", "//mojo/converters/input_events", "//mojo/converters/surfaces", "//third_party/mojo/src/mojo/public/c/gles2", - "//third_party/mojo/src/mojo/public/cpp/application", - "//third_party/mojo/src/mojo/public/interfaces/application:application", "//third_party/icu", "//ui/aura", "//ui/compositor", diff --git a/mandoline/ui/aura/DEPS b/mandoline/ui/aura/DEPS index 5f3791bb51d9b5..d0f3ec3987b659 100644 --- a/mandoline/ui/aura/DEPS +++ b/mandoline/ui/aura/DEPS @@ -4,6 +4,7 @@ include_rules = [ "+components/gpu", "+components/surfaces", "+components/view_manager", + "+mojo/application/public", "+mojo/cc", "+mojo/converters", "+mojo/public", diff --git a/mandoline/ui/aura/surface_binding.cc b/mandoline/ui/aura/surface_binding.cc index e7c8013a319070..c1b09303ba9f8b 100644 --- a/mandoline/ui/aura/surface_binding.cc +++ b/mandoline/ui/aura/surface_binding.cc @@ -19,11 +19,11 @@ #include "components/view_manager/public/cpp/view.h" #include "components/view_manager/public/cpp/view_manager.h" #include "mandoline/ui/aura/window_tree_host_mojo.h" +#include "mojo/application/public/cpp/connect.h" +#include "mojo/application/public/interfaces/shell.mojom.h" #include "mojo/cc/context_provider_mojo.h" #include "mojo/converters/geometry/geometry_type_converters.h" #include "mojo/converters/surfaces/surfaces_type_converters.h" -#include "mojo/public/cpp/application/connect.h" -#include "mojo/public/interfaces/application/shell.mojom.h" namespace mandoline { namespace { diff --git a/mandoline/ui/aura/surface_context_factory.cc b/mandoline/ui/aura/surface_context_factory.cc index 1253675d60635e..b91a3d2e5b391c 100644 --- a/mandoline/ui/aura/surface_context_factory.cc +++ b/mandoline/ui/aura/surface_context_factory.cc @@ -8,7 +8,7 @@ #include "cc/resources/shared_bitmap_manager.h" #include "cc/surfaces/surface_id_allocator.h" #include "components/view_manager/public/cpp/view.h" -#include "mojo/public/interfaces/application/shell.mojom.h" +#include "mojo/application/public/interfaces/shell.mojom.h" #include "ui/compositor/reflector.h" #include "ui/gl/gl_bindings.h" diff --git a/mandoline/ui/aura/window_tree_host_mojo.cc b/mandoline/ui/aura/window_tree_host_mojo.cc index b41742a3a6e033..293025d5e16703 100644 --- a/mandoline/ui/aura/window_tree_host_mojo.cc +++ b/mandoline/ui/aura/window_tree_host_mojo.cc @@ -6,8 +6,8 @@ #include "components/view_manager/public/cpp/view_manager.h" #include "mandoline/ui/aura/surface_context_factory.h" +#include "mojo/application/public/interfaces/shell.mojom.h" #include "mojo/converters/geometry/geometry_type_converters.h" -#include "mojo/public/interfaces/application/shell.mojom.h" #include "ui/aura/env.h" #include "ui/aura/window.h" #include "ui/aura/window_event_dispatcher.h" diff --git a/mandoline/ui/browser/BUILD.gn b/mandoline/ui/browser/BUILD.gn index e32e2da60267e9..f9f3bacb48c01f 100644 --- a/mandoline/ui/browser/BUILD.gn +++ b/mandoline/ui/browser/BUILD.gn @@ -20,10 +20,10 @@ mojo_native_application("window_manager") { ":kiosk_wm_lib", "//mandoline/services/navigation/public/interfaces", "//mojo/application", + "//mojo/application/public/interfaces", "//mojo/common:common", "//third_party/mojo/src/mojo/public/cpp/bindings", "//third_party/mojo/src/mojo/public/cpp/utility", - "//third_party/mojo/src/mojo/public/interfaces/application", ] } @@ -55,11 +55,11 @@ source_set("kiosk_wm_lib") { "//components/view_manager/public/cpp", "//components/window_manager:lib", "//mandoline/services/navigation/public/interfaces", + "//mojo/application/public/interfaces", "//mojo/converters/geometry", "//skia", "//third_party/mojo/src/mojo/public/cpp/bindings", "//third_party/mojo/src/mojo/public/cpp/utility", - "//third_party/mojo/src/mojo/public/interfaces/application", "//ui/gfx/geometry", "//ui/mojo/events:interfaces", ] diff --git a/mandoline/ui/browser/browser.h b/mandoline/ui/browser/browser.h index f158e29a300817..d8f22cc0c363b4 100644 --- a/mandoline/ui/browser/browser.h +++ b/mandoline/ui/browser/browser.h @@ -12,10 +12,10 @@ #include "mandoline/services/navigation/public/interfaces/navigation.mojom.h" #include "mandoline/ui/browser/navigator_host_impl.h" #include "mandoline/ui/browser/omnibox.mojom.h" -#include "third_party/mojo/src/mojo/public/cpp/application/application_delegate.h" -#include "third_party/mojo/src/mojo/public/cpp/application/application_impl.h" -#include "third_party/mojo/src/mojo/public/cpp/application/connect.h" -#include "third_party/mojo/src/mojo/public/cpp/application/service_provider_impl.h" +#include "mojo/application/public/cpp/application_delegate.h" +#include "mojo/application/public/cpp/application_impl.h" +#include "mojo/application/public/cpp/connect.h" +#include "mojo/application/public/cpp/service_provider_impl.h" #include "ui/mojo/events/input_events.mojom.h" #include "url/gurl.h" diff --git a/mandoline/ui/browser/merged_service_provider.h b/mandoline/ui/browser/merged_service_provider.h index 52fcea2f92436b..20a94d5dbe6c0e 100644 --- a/mandoline/ui/browser/merged_service_provider.h +++ b/mandoline/ui/browser/merged_service_provider.h @@ -7,9 +7,9 @@ #include "base/memory/scoped_ptr.h" #include "mandoline/services/navigation/public/interfaces/navigation.mojom.h" -#include "third_party/mojo/src/mojo/public/cpp/application/interface_factory.h" +#include "mojo/application/public/cpp/interface_factory.h" +#include "mojo/application/public/interfaces/service_provider.mojom.h" #include "third_party/mojo/src/mojo/public/cpp/bindings/binding.h" -#include "third_party/mojo/src/mojo/public/interfaces/application/service_provider.mojom.h" namespace mandoline { diff --git a/mandoline/ui/omnibox/BUILD.gn b/mandoline/ui/omnibox/BUILD.gn index f981a0244f4edf..1f6ffa37d47648 100644 --- a/mandoline/ui/omnibox/BUILD.gn +++ b/mandoline/ui/omnibox/BUILD.gn @@ -14,10 +14,10 @@ mojo_native_application("omnibox") { ":lib", "//mandoline/services/navigation/public/interfaces", "//mojo/application", + "//mojo/application/public/interfaces", "//mojo/common:common", "//third_party/mojo/src/mojo/public/cpp/bindings", "//third_party/mojo/src/mojo/public/cpp/utility", - "//third_party/mojo/src/mojo/public/interfaces/application", ] } @@ -34,11 +34,11 @@ source_set("lib") { "//mandoline/services/navigation/public/interfaces", "//mandoline/ui/aura", "//mandoline/ui/browser:interfaces", + "//mojo/application/public/interfaces", "//mojo/converters/geometry", "//skia", "//third_party/mojo/src/mojo/public/cpp/bindings", "//third_party/mojo/src/mojo/public/cpp/utility", - "//third_party/mojo/src/mojo/public/interfaces/application", "//ui/gfx/geometry", "//ui/mojo/events:interfaces", ] diff --git a/mandoline/ui/omnibox/omnibox_impl.cc b/mandoline/ui/omnibox/omnibox_impl.cc index cef777ced0dcb1..2cf054b87483e9 100644 --- a/mandoline/ui/omnibox/omnibox_impl.cc +++ b/mandoline/ui/omnibox/omnibox_impl.cc @@ -9,9 +9,9 @@ #include "components/window_manager/public/interfaces/window_manager.mojom.h" #include "mandoline/ui/aura/aura_init.h" #include "mandoline/ui/aura/native_widget_view_manager.h" +#include "mojo/application/public/cpp/application_impl.h" #include "mojo/common/common_type_converters.h" #include "mojo/converters/geometry/geometry_type_converters.h" -#include "third_party/mojo/src/mojo/public/cpp/application/application_impl.h" #include "ui/views/background.h" #include "ui/views/controls/textfield/textfield.h" #include "ui/views/widget/widget_delegate.h" diff --git a/mandoline/ui/omnibox/omnibox_impl.h b/mandoline/ui/omnibox/omnibox_impl.h index f5b3cdc8faa0bb..0d59c769ea9242 100644 --- a/mandoline/ui/omnibox/omnibox_impl.h +++ b/mandoline/ui/omnibox/omnibox_impl.h @@ -7,9 +7,9 @@ #include "components/view_manager/public/cpp/view_manager_delegate.h" #include "mandoline/ui/browser/omnibox.mojom.h" +#include "mojo/application/public/cpp/application_delegate.h" +#include "mojo/application/public/cpp/interface_factory.h" #include "mojo/common/weak_binding_set.h" -#include "third_party/mojo/src/mojo/public/cpp/application/application_delegate.h" -#include "third_party/mojo/src/mojo/public/cpp/application/interface_factory.h" #include "ui/views/controls/textfield/textfield_controller.h" #include "ui/views/layout/layout_manager.h" diff --git a/media/mojo/interfaces/mojo_bindings.gyp b/media/mojo/interfaces/mojo_bindings.gyp index e5b0ac690a6c70..44570019e11fac 100644 --- a/media/mojo/interfaces/mojo_bindings.gyp +++ b/media/mojo/interfaces/mojo_bindings.gyp @@ -17,8 +17,8 @@ 'type': 'static_library', 'dependencies': [ 'platform_verification_mojo_bindings', + '../../../mojo/mojo_base.gyp:mojo_application_bindings', '../../../mojo/mojo_base.gyp:mojo_environment_chromium', - '../../../third_party/mojo/mojo_public.gyp:mojo_application_bindings', '../../../third_party/mojo/mojo_public.gyp:mojo_cpp_bindings', ], 'sources': [ diff --git a/media/mojo/services/BUILD.gn b/media/mojo/services/BUILD.gn index c8ec687bab3d72..779dadfe2c8915 100644 --- a/media/mojo/services/BUILD.gn +++ b/media/mojo/services/BUILD.gn @@ -43,9 +43,9 @@ source_set("cdm_proxy") { "//base", "//media", "//media/mojo/interfaces", + "//mojo/application/public/interfaces", "//mojo/common", "//mojo/environment:chromium", - "//third_party/mojo/src/mojo/public/interfaces/application", "//third_party/mojo/src/mojo/public/c/system:for_component", ] @@ -62,9 +62,9 @@ source_set("cdm_service") { "//base", "//media", "//media/mojo/interfaces", + "//mojo/application/public/interfaces", "//mojo/common", "//mojo/environment:chromium", - "//third_party/mojo/src/mojo/public/interfaces/application", "//third_party/mojo/src/mojo/public/c/system:for_component", ] @@ -97,10 +97,10 @@ source_set("renderer_proxy") { "//base", "//media", "//media/mojo/interfaces", + "//mojo/application/public/interfaces", "//mojo/common", "//mojo/environment:chromium", "//third_party/mojo/src/mojo/public/c/system:for_component", - "//third_party/mojo/src/mojo/public/interfaces/application", ] } diff --git a/media/mojo/services/mojo_cdm.cc b/media/mojo/services/mojo_cdm.cc index 17a1a4892ef8f9..e7587115e5fc21 100644 --- a/media/mojo/services/mojo_cdm.cc +++ b/media/mojo/services/mojo_cdm.cc @@ -9,9 +9,9 @@ #include "media/base/cdm_key_information.h" #include "media/base/cdm_promise.h" #include "media/mojo/services/media_type_converters.h" -#include "third_party/mojo/src/mojo/public/cpp/application/connect.h" +#include "mojo/application/public/cpp/connect.h" +#include "mojo/application/public/interfaces/service_provider.mojom.h" #include "third_party/mojo/src/mojo/public/cpp/bindings/interface_impl.h" -#include "third_party/mojo/src/mojo/public/interfaces/application/service_provider.mojom.h" #include "url/gurl.h" namespace media { diff --git a/media/mojo/services/mojo_media_application.cc b/media/mojo/services/mojo_media_application.cc index 7a24637a0f95cf..7aeaabc250b8cd 100644 --- a/media/mojo/services/mojo_media_application.cc +++ b/media/mojo/services/mojo_media_application.cc @@ -5,11 +5,11 @@ #include "base/logging.h" #include "media/mojo/services/mojo_renderer_service.h" #include "mojo/application/application_runner_chromium.h" +#include "mojo/application/public/cpp/application_connection.h" +#include "mojo/application/public/cpp/application_delegate.h" +#include "mojo/application/public/cpp/application_impl.h" +#include "mojo/application/public/cpp/interface_factory_impl.h" #include "third_party/mojo/src/mojo/public/c/system/main.h" -#include "third_party/mojo/src/mojo/public/cpp/application/application_connection.h" -#include "third_party/mojo/src/mojo/public/cpp/application/application_delegate.h" -#include "third_party/mojo/src/mojo/public/cpp/application/application_impl.h" -#include "third_party/mojo/src/mojo/public/cpp/application/interface_factory_impl.h" namespace media { diff --git a/media/mojo/services/mojo_renderer_impl.cc b/media/mojo/services/mojo_renderer_impl.cc index 73e677ddb997a1..21736af7e1cd40 100644 --- a/media/mojo/services/mojo_renderer_impl.cc +++ b/media/mojo/services/mojo_renderer_impl.cc @@ -11,9 +11,9 @@ #include "media/base/bind_to_current_loop.h" #include "media/base/demuxer_stream_provider.h" #include "media/mojo/services/mojo_demuxer_stream_impl.h" -#include "third_party/mojo/src/mojo/public/cpp/application/connect.h" +#include "mojo/application/public/cpp/connect.h" +#include "mojo/application/public/interfaces/service_provider.mojom.h" #include "third_party/mojo/src/mojo/public/cpp/bindings/interface_impl.h" -#include "third_party/mojo/src/mojo/public/interfaces/application/service_provider.mojom.h" namespace media { diff --git a/media/test/DEPS b/media/test/DEPS index 5f8633a1fb6ad1..e402e7fc25e194 100644 --- a/media/test/DEPS +++ b/media/test/DEPS @@ -1,3 +1,3 @@ include_rules = [ - "+third_party/mojo/src/mojo/public", + "+mojo/application/public/cpp", ] diff --git a/media/test/pipeline_integration_test.cc b/media/test/pipeline_integration_test.cc index dd214eba9443c0..5af6938e449eba 100644 --- a/media/test/pipeline_integration_test.cc +++ b/media/test/pipeline_integration_test.cc @@ -26,9 +26,9 @@ #if defined(MOJO_RENDERER) #include "media/mojo/services/mojo_renderer_impl.h" -#include "third_party/mojo/src/mojo/public/cpp/application/application_impl.h" -#include "third_party/mojo/src/mojo/public/cpp/application/application_test_base.h" -#include "third_party/mojo/src/mojo/public/cpp/application/connect.h" +#include "mojo/application/public/cpp/application_impl.h" +#include "mojo/application/public/cpp/application_test_base.h" +#include "mojo/application/public/cpp/connect.h" // TODO(dalecurtis): The mojo renderer is in another process, so we have no way // currently to get hashes for video and audio samples. This also means that diff --git a/mojo/BUILD.gn b/mojo/BUILD.gn index 34bf4e4d812323..5bcbc9573d9944 100644 --- a/mojo/BUILD.gn +++ b/mojo/BUILD.gn @@ -26,12 +26,12 @@ group("mojo") { group("tests") { testonly = true deps = [ + "//mojo/application/public/cpp/tests:mojo_public_application_unittests", "//mojo/common:mojo_common_unittests", "//mojo/converters/surfaces/tests:mojo_surfaces_lib_unittests", "//third_party/mojo/src/mojo/edk/js/test:js_unittests", "//third_party/mojo/src/mojo/edk/system:mojo_message_pipe_perftests", "//third_party/mojo/src/mojo/edk/system:mojo_system_unittests", - "//third_party/mojo/src/mojo/edk/test:mojo_public_application_unittests", "//third_party/mojo/src/mojo/edk/test:mojo_public_bindings_unittests", "//third_party/mojo/src/mojo/edk/test:mojo_public_environment_unittests", "//third_party/mojo/src/mojo/edk/test:mojo_public_system_perftests", diff --git a/mojo/application/BUILD.gn b/mojo/application/BUILD.gn index 958d87b0cc2a8c..5800c0cfec88d7 100644 --- a/mojo/application/BUILD.gn +++ b/mojo/application/BUILD.gn @@ -10,7 +10,7 @@ source_set("application") { ] public_deps = [ - "//third_party/mojo/src/mojo/public/cpp/application", + "//mojo/application/public/cpp:application", ] deps = [ "//base", @@ -27,9 +27,9 @@ source_set("content_handler") { deps = [ ":application", "//base", + "//mojo/application/public/interfaces", "//mojo/common", "//mojo/environment:chromium", - "//third_party/mojo/src/mojo/public/interfaces/application", "//third_party/mojo_services/src/content_handler/public/interfaces", "//mojo/services/network/public/interfaces", ] @@ -46,7 +46,7 @@ source_set("test_support") { deps = [ "//base", "//base/test:test_support", - "//third_party/mojo/src/mojo/public/cpp/application:application", + "//mojo/application/public/cpp:application", "//third_party/mojo/src/mojo/public/cpp/bindings", "//third_party/mojo/src/mojo/public/cpp/environment", "//third_party/mojo/src/mojo/public/cpp/system", diff --git a/mojo/application/application_runner_chromium.cc b/mojo/application/application_runner_chromium.cc index e5f21caa20b9a1..35d945d42bd918 100644 --- a/mojo/application/application_runner_chromium.cc +++ b/mojo/application/application_runner_chromium.cc @@ -9,9 +9,9 @@ #include "base/debug/stack_trace.h" #include "base/memory/scoped_ptr.h" #include "base/message_loop/message_loop.h" +#include "mojo/application/public/cpp/application_delegate.h" +#include "mojo/application/public/cpp/application_impl.h" #include "mojo/common/message_pump_mojo.h" -#include "mojo/public/cpp/application/application_delegate.h" -#include "mojo/public/cpp/application/application_impl.h" int g_argc; const char* const* g_argv; diff --git a/mojo/application/application_test_base_chromium.cc b/mojo/application/application_test_base_chromium.cc index 72bf1894ea31e1..bb9afa14247b80 100644 --- a/mojo/application/application_test_base_chromium.cc +++ b/mojo/application/application_test_base_chromium.cc @@ -6,11 +6,11 @@ #include "base/command_line.h" #include "base/strings/utf_string_conversions.h" -#include "mojo/public/cpp/application/application_impl.h" +#include "mojo/application/public/cpp/application_impl.h" +#include "mojo/application/public/interfaces/application.mojom.h" #include "mojo/public/cpp/bindings/binding.h" #include "mojo/public/cpp/environment/environment.h" #include "mojo/public/cpp/system/message_pipe.h" -#include "mojo/public/interfaces/application/application.mojom.h" namespace mojo { namespace test { diff --git a/mojo/application/application_test_base_chromium.h b/mojo/application/application_test_base_chromium.h index c050848ee73d17..ee17e420732486 100644 --- a/mojo/application/application_test_base_chromium.h +++ b/mojo/application/application_test_base_chromium.h @@ -5,11 +5,11 @@ #ifndef MOJO_APPLICATION_APPLICATION_TEST_BASE_CHROMIUM_H_ #define MOJO_APPLICATION_APPLICATION_TEST_BASE_CHROMIUM_H_ -#include "mojo/public/cpp/application/application_delegate.h" +#include "mojo/application/public/cpp/application_delegate.h" +#include "mojo/application/public/interfaces/application.mojom.h" #include "mojo/public/cpp/bindings/array.h" #include "mojo/public/cpp/bindings/string.h" #include "mojo/public/cpp/system/macros.h" -#include "mojo/public/interfaces/application/application.mojom.h" #include "testing/gtest/include/gtest/gtest.h" namespace mojo { diff --git a/mojo/application/content_handler_factory.cc b/mojo/application/content_handler_factory.cc index 8518f4c937ff4f..9fac37184fb372 100644 --- a/mojo/application/content_handler_factory.cc +++ b/mojo/application/content_handler_factory.cc @@ -11,11 +11,11 @@ #include "base/memory/weak_ptr.h" #include "base/threading/platform_thread.h" #include "mojo/application/application_runner_chromium.h" +#include "mojo/application/public/cpp/application_connection.h" +#include "mojo/application/public/cpp/application_delegate.h" +#include "mojo/application/public/cpp/application_impl.h" +#include "mojo/application/public/cpp/interface_factory_impl.h" #include "mojo/common/message_pump_mojo.h" -#include "mojo/public/cpp/application/application_connection.h" -#include "mojo/public/cpp/application/application_delegate.h" -#include "mojo/public/cpp/application/application_impl.h" -#include "mojo/public/cpp/application/interface_factory_impl.h" #include "mojo/public/cpp/bindings/strong_binding.h" namespace mojo { diff --git a/mojo/application/content_handler_factory.h b/mojo/application/content_handler_factory.h index aabba6f53a81e1..25ee2be9a5dc32 100644 --- a/mojo/application/content_handler_factory.h +++ b/mojo/application/content_handler_factory.h @@ -6,8 +6,8 @@ #define MOJO_APPLICATION_CONTENT_HANDLER_FACTORY_H_ #include "base/memory/scoped_ptr.h" -#include "mojo/public/cpp/application/interface_factory.h" -#include "mojo/public/interfaces/application/shell.mojom.h" +#include "mojo/application/public/cpp/interface_factory.h" +#include "mojo/application/public/interfaces/shell.mojom.h" #include "mojo/services/network/public/interfaces/url_loader.mojom.h" #include "third_party/mojo_services/src/content_handler/public/interfaces/content_handler.mojom.h" diff --git a/third_party/mojo/src/mojo/public/cpp/application/BUILD.gn b/mojo/application/public/cpp/BUILD.gn similarity index 80% rename from third_party/mojo/src/mojo/public/cpp/application/BUILD.gn rename to mojo/application/public/cpp/BUILD.gn index c3a9fc942fcf47..796f615edc2c1b 100644 --- a/third_party/mojo/src/mojo/public/cpp/application/BUILD.gn +++ b/mojo/application/public/cpp/BUILD.gn @@ -2,10 +2,11 @@ # Use of this source code is governed by a BSD-style license that can be # found in the LICENSE file. -import("../../mojo_sdk.gni") +import("//third_party/mojo/src/mojo/public/mojo_sdk.gni") -# GYP version: mojo/public/mojo_public.gyp:mojo_application_base +# GYP version: mojo/mojo_base.gyp:mojo_application_base mojo_sdk_source_set("application") { + restrict_external_deps = false sources = [ "application_connection.h", "application_delegate.h", @@ -26,15 +27,18 @@ mojo_sdk_source_set("application") { "service_provider_impl.h", ] + deps = [ + "//mojo/application/public/interfaces", + ] + mojo_sdk_deps = [ "mojo/public/cpp/bindings", "mojo/public/cpp/environment", "mojo/public/cpp/system", - "mojo/public/interfaces/application", ] } -# GYP version: mojo/public/mojo_public.gyp:mojo_application_standalone +# GYP version: mojo/mojo_base.gyp:mojo_application_standalone mojo_sdk_source_set("standalone") { sources = [ "lib/application_runner.cc", @@ -52,6 +56,7 @@ mojo_sdk_source_set("standalone") { mojo_sdk_source_set("test_support") { testonly = true + restrict_external_deps = false sources = [ "application_test_base.h", "lib/application_test_base.cc", @@ -59,6 +64,7 @@ mojo_sdk_source_set("test_support") { deps = [ ":application", + "//mojo/application/public/interfaces", "//testing/gtest", ] @@ -66,12 +72,12 @@ mojo_sdk_source_set("test_support") { "mojo/public/cpp/bindings", "mojo/public/cpp/environment", "mojo/public/cpp/system", - "mojo/public/interfaces/application", ] } mojo_sdk_source_set("test_support_standalone") { testonly = true + restrict_external_deps = false sources = [ "lib/application_test_main.cc", ] @@ -82,13 +88,12 @@ mojo_sdk_source_set("test_support_standalone") { deps = [ ":application", + "//mojo/application/public/interfaces", ] mojo_sdk_deps = [ - "mojo/public/interfaces/application", "mojo/public/cpp/environment:standalone", "mojo/public/cpp/system", "mojo/public/cpp/utility", - "mojo/public/interfaces/application", ] } diff --git a/third_party/mojo/src/mojo/public/cpp/application/application_connection.h b/mojo/application/public/cpp/application_connection.h similarity index 92% rename from third_party/mojo/src/mojo/public/cpp/application/application_connection.h rename to mojo/application/public/cpp/application_connection.h index 6673b7a9b43734..ff900d3668c752 100644 --- a/third_party/mojo/src/mojo/public/cpp/application/application_connection.h +++ b/mojo/application/public/cpp/application_connection.h @@ -2,13 +2,13 @@ // Use of this source code is governed by a BSD-style license that can be // found in the LICENSE file. -#ifndef MOJO_PUBLIC_APPLICATION_APPLICATION_CONNECTION_H_ -#define MOJO_PUBLIC_APPLICATION_APPLICATION_CONNECTION_H_ +#ifndef MOJO_APPLICATION_PUBLIC_CPP_APPLICATION_CONNECTION_H_ +#define MOJO_APPLICATION_PUBLIC_CPP_APPLICATION_CONNECTION_H_ #include -#include "mojo/public/cpp/application/lib/interface_factory_connector.h" -#include "mojo/public/interfaces/application/service_provider.mojom.h" +#include "mojo/application/public/cpp/lib/interface_factory_connector.h" +#include "mojo/application/public/interfaces/service_provider.mojom.h" namespace mojo { @@ -95,4 +95,4 @@ class ApplicationConnection { } // namespace mojo -#endif // MOJO_PUBLIC_APPLICATION_APPLICATION_CONNECTION_H_ +#endif // MOJO_APPLICATION_PUBLIC_CPP_APPLICATION_CONNECTION_H_ diff --git a/third_party/mojo/src/mojo/public/cpp/application/application_delegate.h b/mojo/application/public/cpp/application_delegate.h similarity index 88% rename from third_party/mojo/src/mojo/public/cpp/application/application_delegate.h rename to mojo/application/public/cpp/application_delegate.h index 5519f6cd78ff56..2c3423fce58c12 100644 --- a/third_party/mojo/src/mojo/public/cpp/application/application_delegate.h +++ b/mojo/application/public/cpp/application_delegate.h @@ -2,8 +2,8 @@ // Use of this source code is governed by a BSD-style license that can be // found in the LICENSE file. -#ifndef MOJO_PUBLIC_APPLICATION_APPLICATION_DELEGATE_H_ -#define MOJO_PUBLIC_APPLICATION_APPLICATION_DELEGATE_H_ +#ifndef MOJO_APPLICATION_PUBLIC_CPP_APPLICATION_DELEGATE_H_ +#define MOJO_APPLICATION_PUBLIC_CPP_APPLICATION_DELEGATE_H_ #include @@ -44,4 +44,4 @@ class ApplicationDelegate { } // namespace mojo -#endif // MOJO_PUBLIC_APPLICATION_APPLICATION_DELEGATE_H_ +#endif // MOJO_APPLICATION_PUBLIC_CPP_APPLICATION_DELEGATE_H_ diff --git a/third_party/mojo/src/mojo/public/cpp/application/application_impl.h b/mojo/application/public/cpp/application_impl.h similarity index 90% rename from third_party/mojo/src/mojo/public/cpp/application/application_impl.h rename to mojo/application/public/cpp/application_impl.h index 294cfff41d0354..a5d58f50f52dc5 100644 --- a/third_party/mojo/src/mojo/public/cpp/application/application_impl.h +++ b/mojo/application/public/cpp/application_impl.h @@ -2,16 +2,17 @@ // Use of this source code is governed by a BSD-style license that can be // found in the LICENSE file. -#ifndef MOJO_PUBLIC_APPLICATION_APPLICATION_IMPL_H_ -#define MOJO_PUBLIC_APPLICATION_APPLICATION_IMPL_H_ +#ifndef MOJO_APPLICATION_PUBLIC_CPP_APPLICATION_IMPL_H_ +#define MOJO_APPLICATION_PUBLIC_CPP_APPLICATION_IMPL_H_ + #include -#include "mojo/public/cpp/application/application_connection.h" -#include "mojo/public/cpp/application/application_delegate.h" -#include "mojo/public/cpp/application/lib/service_registry.h" +#include "mojo/application/public/cpp/application_connection.h" +#include "mojo/application/public/cpp/application_delegate.h" +#include "mojo/application/public/cpp/lib/service_registry.h" +#include "mojo/application/public/interfaces/application.mojom.h" +#include "mojo/application/public/interfaces/shell.mojom.h" #include "mojo/public/cpp/system/core.h" -#include "mojo/public/interfaces/application/application.mojom.h" -#include "mojo/public/interfaces/application/shell.mojom.h" namespace mojo { @@ -136,4 +137,4 @@ class ApplicationImpl : public Application { } // namespace mojo -#endif // MOJO_PUBLIC_APPLICATION_APPLICATION_IMPL_H_ +#endif // MOJO_APPLICATION_PUBLIC_CPP_APPLICATION_IMPL_H_ diff --git a/third_party/mojo/src/mojo/public/cpp/application/application_runner.h b/mojo/application/public/cpp/application_runner.h similarity index 87% rename from third_party/mojo/src/mojo/public/cpp/application/application_runner.h rename to mojo/application/public/cpp/application_runner.h index 3d3c868767c7ad..e537c666135bbf 100644 --- a/third_party/mojo/src/mojo/public/cpp/application/application_runner.h +++ b/mojo/application/public/cpp/application_runner.h @@ -2,8 +2,8 @@ // Use of this source code is governed by a BSD-style license that can be // found in the LICENSE file. -#ifndef MOJO_PUBLIC_APPLICATION_APPLICATION_RUNNER_H_ -#define MOJO_PUBLIC_APPLICATION_APPLICATION_RUNNER_H_ +#ifndef MOJO_APPLICATION_PUBLIC_CPP_APPLICATION_RUNNER_H_ +#define MOJO_APPLICATION_PUBLIC_CPP_APPLICATION_RUNNER_H_ #include "mojo/public/cpp/system/core.h" @@ -41,4 +41,4 @@ class ApplicationRunner { } // namespace mojo -#endif // MOJO_PUBLIC_APPLICATION_APPLICATION_RUNNER_H_ +#endif // MOJO_APPLICATION_PUBLIC_CPP_APPLICATION_RUNNER_H_ diff --git a/third_party/mojo/src/mojo/public/cpp/application/application_test_base.h b/mojo/application/public/cpp/application_test_base.h similarity index 85% rename from third_party/mojo/src/mojo/public/cpp/application/application_test_base.h rename to mojo/application/public/cpp/application_test_base.h index 10763be4bf36dc..9314bda23c1a78 100644 --- a/third_party/mojo/src/mojo/public/cpp/application/application_test_base.h +++ b/mojo/application/public/cpp/application_test_base.h @@ -2,14 +2,14 @@ // Use of this source code is governed by a BSD-style license that can be // found in the LICENSE file. -#ifndef MOJO_PUBLIC_CPP_APPLICATION_APPLICATION_TEST_BASE_H_ -#define MOJO_PUBLIC_CPP_APPLICATION_APPLICATION_TEST_BASE_H_ +#ifndef MOJO_APPLICATION_PUBLIC_CPP_APPLICATION_TEST_BASE_H_ +#define MOJO_APPLICATION_PUBLIC_CPP_APPLICATION_TEST_BASE_H_ -#include "mojo/public/cpp/application/application_delegate.h" +#include "mojo/application/public/cpp/application_delegate.h" +#include "mojo/application/public/interfaces/application.mojom.h" #include "mojo/public/cpp/bindings/array.h" #include "mojo/public/cpp/bindings/string.h" #include "mojo/public/cpp/system/macros.h" -#include "mojo/public/interfaces/application/application.mojom.h" #include "testing/gtest/include/gtest/gtest.h" namespace mojo { @@ -59,4 +59,4 @@ class ApplicationTestBase : public testing::Test { } // namespace mojo -#endif // MOJO_PUBLIC_CPP_APPLICATION_APPLICATION_TEST_BASE_H_ +#endif // MOJO_APPLICATION_PUBLIC_CPP_APPLICATION_TEST_BASE_H_ diff --git a/third_party/mojo/src/mojo/public/cpp/application/connect.h b/mojo/application/public/cpp/connect.h similarity index 74% rename from third_party/mojo/src/mojo/public/cpp/application/connect.h rename to mojo/application/public/cpp/connect.h index e427ce6237ee54..ecf920e042c5de 100644 --- a/third_party/mojo/src/mojo/public/cpp/application/connect.h +++ b/mojo/application/public/cpp/connect.h @@ -2,10 +2,10 @@ // Use of this source code is governed by a BSD-style license that can be // found in the LICENSE file. -#ifndef MOJO_PUBLIC_CPP_APPLICATION_CONNECT_H_ -#define MOJO_PUBLIC_CPP_APPLICATION_CONNECT_H_ +#ifndef MOJO_APPLICATION_PUBLIC_CPP_CONNECT_H_ +#define MOJO_APPLICATION_PUBLIC_CPP_CONNECT_H_ -#include "mojo/public/interfaces/application/service_provider.mojom.h" +#include "mojo/application/public/interfaces/service_provider.mojom.h" namespace mojo { @@ -20,4 +20,4 @@ inline void ConnectToService(ServiceProvider* service_provider, } // namespace mojo -#endif // MOJO_PUBLIC_CPP_APPLICATION_CONNECT_H_ +#endif // MOJO_APPLICATION_PUBLIC_CPP_CONNECT_H_ diff --git a/third_party/mojo/src/mojo/public/cpp/application/interface_factory.h b/mojo/application/public/cpp/interface_factory.h similarity index 83% rename from third_party/mojo/src/mojo/public/cpp/application/interface_factory.h rename to mojo/application/public/cpp/interface_factory.h index 8840fcb8eaf591..cd7f6e16c607a7 100644 --- a/third_party/mojo/src/mojo/public/cpp/application/interface_factory.h +++ b/mojo/application/public/cpp/interface_factory.h @@ -2,8 +2,8 @@ // Use of this source code is governed by a BSD-style license that can be // found in the LICENSE file. -#ifndef MOJO_PUBLIC_CPP_APPLICATION_INTERFACE_FACTORY_H_ -#define MOJO_PUBLIC_CPP_APPLICATION_INTERFACE_FACTORY_H_ +#ifndef MOJO_APPLICATION_PUBLIC_CPP_INTERFACE_FACTORY_H_ +#define MOJO_APPLICATION_PUBLIC_CPP_INTERFACE_FACTORY_H_ #include "mojo/public/cpp/bindings/interface_impl.h" #include "mojo/public/cpp/bindings/interface_request.h" @@ -28,4 +28,4 @@ class InterfaceFactory { } // namespace mojo -#endif // MOJO_PUBLIC_CPP_APPLICATION_INTERFACE_FACTORY_H_ +#endif // MOJO_APPLICATION_PUBLIC_CPP_INTERFACE_FACTORY_H_ diff --git a/third_party/mojo/src/mojo/public/cpp/application/interface_factory_impl.h b/mojo/application/public/cpp/interface_factory_impl.h similarity index 85% rename from third_party/mojo/src/mojo/public/cpp/application/interface_factory_impl.h rename to mojo/application/public/cpp/interface_factory_impl.h index 72d32547ecd68d..d4cf1c279c06a9 100644 --- a/third_party/mojo/src/mojo/public/cpp/application/interface_factory_impl.h +++ b/mojo/application/public/cpp/interface_factory_impl.h @@ -2,10 +2,10 @@ // Use of this source code is governed by a BSD-style license that can be // found in the LICENSE file. -#ifndef MOJO_PUBLIC_CPP_APPLICATION_INTERFACE_FACTORY_IMPL_H_ -#define MOJO_PUBLIC_CPP_APPLICATION_INTERFACE_FACTORY_IMPL_H_ +#ifndef MOJO_APPLICATION_PUBLIC_CPP_INTERFACE_FACTORY_IMPL_H_ +#define MOJO_APPLICATION_PUBLIC_CPP_INTERFACE_FACTORY_IMPL_H_ -#include "mojo/public/cpp/application/interface_factory.h" +#include "mojo/application/public/cpp/interface_factory.h" namespace mojo { @@ -46,4 +46,4 @@ class InterfaceFactoryImplWithContext : public InterfaceFactory { } // namespace mojo -#endif // MOJO_PUBLIC_CPP_APPLICATION_INTERFACE_FACTORY_IMPL_H_ +#endif // MOJO_APPLICATION_PUBLIC_CPP_INTERFACE_FACTORY_IMPL_H_ diff --git a/third_party/mojo/src/mojo/public/cpp/application/lazy_interface_ptr.h b/mojo/application/public/cpp/lazy_interface_ptr.h similarity index 80% rename from third_party/mojo/src/mojo/public/cpp/application/lazy_interface_ptr.h rename to mojo/application/public/cpp/lazy_interface_ptr.h index 2d58db129554cf..090beb294c9d4c 100644 --- a/third_party/mojo/src/mojo/public/cpp/application/lazy_interface_ptr.h +++ b/mojo/application/public/cpp/lazy_interface_ptr.h @@ -2,11 +2,11 @@ // Use of this source code is governed by a BSD-style license that can be // found in the LICENSE file. -#ifndef MOJO_PUBLIC_CPP_APPLICATION_LAZY_INTERFACE_PTR_H_ -#define MOJO_PUBLIC_CPP_APPLICATION_LAZY_INTERFACE_PTR_H_ +#ifndef MOJO_APPLICATION_PUBLIC_CPP_LAZY_INTERFACE_PTR_H_ +#define MOJO_APPLICATION_PUBLIC_CPP_LAZY_INTERFACE_PTR_H_ -#include "mojo/public/cpp/application/connect.h" -#include "mojo/public/interfaces/application/service_provider.mojom.h" +#include "mojo/application/public/cpp/connect.h" +#include "mojo/application/public/interfaces/service_provider.mojom.h" namespace mojo { @@ -43,4 +43,4 @@ class LazyInterfacePtr : public InterfacePtr { } // namespace mojo -#endif // MOJO_PUBLIC_CPP_APPLICATION_LAZY_INTERFACE_PTR_H_ +#endif // MOJO_APPLICATION_PUBLIC_CPP_LAZY_INTERFACE_PTR_H_ diff --git a/third_party/mojo/src/mojo/public/cpp/application/lib/application_connection.cc b/mojo/application/public/cpp/lib/application_connection.cc similarity index 80% rename from third_party/mojo/src/mojo/public/cpp/application/lib/application_connection.cc rename to mojo/application/public/cpp/lib/application_connection.cc index d5578172e07772..a76757f552bbb0 100644 --- a/third_party/mojo/src/mojo/public/cpp/application/lib/application_connection.cc +++ b/mojo/application/public/cpp/lib/application_connection.cc @@ -2,7 +2,7 @@ // Use of this source code is governed by a BSD-style license that can be // found in the LICENSE file. -#include "mojo/public/cpp/application/application_connection.h" +#include "mojo/application/public/cpp/application_connection.h" namespace mojo { diff --git a/third_party/mojo/src/mojo/public/cpp/application/lib/application_delegate.cc b/mojo/application/public/cpp/lib/application_delegate.cc similarity index 91% rename from third_party/mojo/src/mojo/public/cpp/application/lib/application_delegate.cc rename to mojo/application/public/cpp/lib/application_delegate.cc index f1c14af1cabe87..bbe75cc449cd51 100644 --- a/third_party/mojo/src/mojo/public/cpp/application/lib/application_delegate.cc +++ b/mojo/application/public/cpp/lib/application_delegate.cc @@ -2,7 +2,7 @@ // Use of this source code is governed by a BSD-style license that can be // found in the LICENSE file. -#include "mojo/public/cpp/application/application_delegate.h" +#include "mojo/application/public/cpp/application_delegate.h" namespace mojo { diff --git a/third_party/mojo/src/mojo/public/cpp/application/lib/application_impl.cc b/mojo/application/public/cpp/lib/application_impl.cc similarity index 95% rename from third_party/mojo/src/mojo/public/cpp/application/lib/application_impl.cc rename to mojo/application/public/cpp/lib/application_impl.cc index 731c562496e991..018729f89bf57f 100644 --- a/third_party/mojo/src/mojo/public/cpp/application/lib/application_impl.cc +++ b/mojo/application/public/cpp/lib/application_impl.cc @@ -2,10 +2,10 @@ // Use of this source code is governed by a BSD-style license that can be // found in the LICENSE file. -#include "mojo/public/cpp/application/application_impl.h" +#include "mojo/application/public/cpp/application_impl.h" -#include "mojo/public/cpp/application/application_delegate.h" -#include "mojo/public/cpp/application/lib/service_registry.h" +#include "mojo/application/public/cpp/application_delegate.h" +#include "mojo/application/public/cpp/lib/service_registry.h" #include "mojo/public/cpp/bindings/interface_ptr.h" #include "mojo/public/cpp/environment/logging.h" diff --git a/third_party/mojo/src/mojo/public/cpp/application/lib/application_runner.cc b/mojo/application/public/cpp/lib/application_runner.cc similarity index 83% rename from third_party/mojo/src/mojo/public/cpp/application/lib/application_runner.cc rename to mojo/application/public/cpp/lib/application_runner.cc index 0737dc76f87f8d..c1d4c0a361c6e1 100644 --- a/third_party/mojo/src/mojo/public/cpp/application/lib/application_runner.cc +++ b/mojo/application/public/cpp/lib/application_runner.cc @@ -2,10 +2,10 @@ // Use of this source code is governed by a BSD-style license that can be // found in the LICENSE file. -#include "mojo/public/cpp/application/application_runner.h" +#include "mojo/application/public/cpp/application_runner.h" -#include "mojo/public/cpp/application/application_delegate.h" -#include "mojo/public/cpp/application/application_impl.h" +#include "mojo/application/public/cpp/application_delegate.h" +#include "mojo/application/public/cpp/application_impl.h" #include "mojo/public/cpp/environment/environment.h" #include "mojo/public/cpp/utility/run_loop.h" diff --git a/third_party/mojo/src/mojo/public/cpp/application/lib/application_test_base.cc b/mojo/application/public/cpp/lib/application_test_base.cc similarity index 98% rename from third_party/mojo/src/mojo/public/cpp/application/lib/application_test_base.cc rename to mojo/application/public/cpp/lib/application_test_base.cc index c4ec87a275b8f8..f3048dad0b5335 100644 --- a/third_party/mojo/src/mojo/public/cpp/application/lib/application_test_base.cc +++ b/mojo/application/public/cpp/lib/application_test_base.cc @@ -4,11 +4,11 @@ #include "mojo/public/cpp/application/application_test_base.h" +#include "mojo/application/public/interfaces/application.mojom.h" #include "mojo/public/cpp/application/application_impl.h" #include "mojo/public/cpp/bindings/binding.h" #include "mojo/public/cpp/environment/environment.h" #include "mojo/public/cpp/system/message_pipe.h" -#include "mojo/public/interfaces/application/application.mojom.h" namespace mojo { namespace test { diff --git a/third_party/mojo/src/mojo/public/cpp/application/lib/application_test_main.cc b/mojo/application/public/cpp/lib/application_test_main.cc similarity index 87% rename from third_party/mojo/src/mojo/public/cpp/application/lib/application_test_main.cc rename to mojo/application/public/cpp/lib/application_test_main.cc index 128d8aef350067..2df150a5693c3a 100644 --- a/third_party/mojo/src/mojo/public/cpp/application/lib/application_test_main.cc +++ b/mojo/application/public/cpp/lib/application_test_main.cc @@ -2,8 +2,8 @@ // Use of this source code is governed by a BSD-style license that can be // found in the LICENSE file. +#include "mojo/application/public/cpp/application_test_base.h" #include "mojo/public/c/system/main.h" -#include "mojo/public/cpp/application/application_test_base.h" #include "mojo/public/cpp/environment/environment.h" MojoResult MojoMain(MojoHandle handle) { diff --git a/third_party/mojo/src/mojo/public/cpp/application/lib/interface_factory_connector.h b/mojo/application/public/cpp/lib/interface_factory_connector.h similarity index 76% rename from third_party/mojo/src/mojo/public/cpp/application/lib/interface_factory_connector.h rename to mojo/application/public/cpp/lib/interface_factory_connector.h index 9b8f4bac4f0776..8d13bc241a4d20 100644 --- a/third_party/mojo/src/mojo/public/cpp/application/lib/interface_factory_connector.h +++ b/mojo/application/public/cpp/lib/interface_factory_connector.h @@ -2,11 +2,11 @@ // Use of this source code is governed by a BSD-style license that can be // found in the LICENSE file. -#ifndef MOJO_PUBLIC_CPP_APPLICATION_LIB_INTERFACE_FACTORY_CONNECTOR_H_ -#define MOJO_PUBLIC_CPP_APPLICATION_LIB_INTERFACE_FACTORY_CONNECTOR_H_ +#ifndef MOJO_APPLICATION_PUBLIC_CPP_LIB_INTERFACE_FACTORY_CONNECTOR_H_ +#define MOJO_APPLICATION_PUBLIC_CPP_LIB_INTERFACE_FACTORY_CONNECTOR_H_ -#include "mojo/public/cpp/application/interface_factory.h" -#include "mojo/public/cpp/application/service_connector.h" +#include "mojo/application/public/cpp/interface_factory.h" +#include "mojo/application/public/cpp/service_connector.h" #include "mojo/public/cpp/bindings/interface_request.h" namespace mojo { @@ -34,4 +34,4 @@ class InterfaceFactoryConnector : public ServiceConnector { } // namespace internal } // namespace mojo -#endif // MOJO_PUBLIC_CPP_APPLICATION_LIB_INTERFACE_FACTORY_CONNECTOR_H_ +#endif // MOJO_APPLICATION_PUBLIC_CPP_LIB_INTERFACE_FACTORY_CONNECTOR_H_ diff --git a/third_party/mojo/src/mojo/public/cpp/application/lib/service_connector_registry.cc b/mojo/application/public/cpp/lib/service_connector_registry.cc similarity index 93% rename from third_party/mojo/src/mojo/public/cpp/application/lib/service_connector_registry.cc rename to mojo/application/public/cpp/lib/service_connector_registry.cc index 7c216cde350d3a..97c43168506398 100644 --- a/third_party/mojo/src/mojo/public/cpp/application/lib/service_connector_registry.cc +++ b/mojo/application/public/cpp/lib/service_connector_registry.cc @@ -2,9 +2,9 @@ // Use of this source code is governed by a BSD-style license that can be // found in the LICENSE file. -#include "mojo/public/cpp/application/lib/service_connector_registry.h" +#include "mojo/application/public/cpp/lib/service_connector_registry.h" -#include "mojo/public/cpp/application/service_connector.h" +#include "mojo/application/public/cpp/service_connector.h" namespace mojo { namespace internal { diff --git a/third_party/mojo/src/mojo/public/cpp/application/lib/service_connector_registry.h b/mojo/application/public/cpp/lib/service_connector_registry.h similarity index 91% rename from third_party/mojo/src/mojo/public/cpp/application/lib/service_connector_registry.h rename to mojo/application/public/cpp/lib/service_connector_registry.h index cc09aca32c7b4e..b19635363e5eb0 100644 --- a/third_party/mojo/src/mojo/public/cpp/application/lib/service_connector_registry.h +++ b/mojo/application/public/cpp/lib/service_connector_registry.h @@ -2,8 +2,8 @@ // Use of this source code is governed by a BSD-style license that can be // found in the LICENSE file. -#ifndef MOJO_PUBLIC_CPP_APPLICATION_LIB_SERVICE_CONNECTOR_REGISTRY_H_ -#define MOJO_PUBLIC_CPP_APPLICATION_LIB_SERVICE_CONNECTOR_REGISTRY_H_ +#ifndef MOJO_APPLICATION_PUBLIC_CPP_LIB_SERVICE_CONNECTOR_REGISTRY_H_ +#define MOJO_APPLICATION_PUBLIC_CPP_LIB_SERVICE_CONNECTOR_REGISTRY_H_ #include #include @@ -59,4 +59,4 @@ class ServiceConnectorRegistry { } // namespace internal } // namespace mojo -#endif // MOJO_PUBLIC_CPP_APPLICATION_LIB_SERVICE_CONNECTOR_REGISTRY_H_ +#endif // MOJO_APPLICATION_PUBLIC_CPP_LIB_SERVICE_CONNECTOR_REGISTRY_H_ diff --git a/third_party/mojo/src/mojo/public/cpp/application/lib/service_provider_impl.cc b/mojo/application/public/cpp/lib/service_provider_impl.cc similarity index 91% rename from third_party/mojo/src/mojo/public/cpp/application/lib/service_provider_impl.cc rename to mojo/application/public/cpp/lib/service_provider_impl.cc index 39191cd0b3ccfb..3d6ee6ed9708c5 100644 --- a/third_party/mojo/src/mojo/public/cpp/application/lib/service_provider_impl.cc +++ b/mojo/application/public/cpp/lib/service_provider_impl.cc @@ -2,9 +2,9 @@ // Use of this source code is governed by a BSD-style license that can be // found in the LICENSE file. -#include "mojo/public/cpp/application/service_provider_impl.h" +#include "mojo/application/public/cpp/service_provider_impl.h" -#include "mojo/public/cpp/application/service_connector.h" +#include "mojo/application/public/cpp/service_connector.h" #include "mojo/public/cpp/environment/logging.h" namespace mojo { diff --git a/third_party/mojo/src/mojo/public/cpp/application/lib/service_registry.cc b/mojo/application/public/cpp/lib/service_registry.cc similarity index 89% rename from third_party/mojo/src/mojo/public/cpp/application/lib/service_registry.cc rename to mojo/application/public/cpp/lib/service_registry.cc index 17238bb1382030..844ec3aacee50f 100644 --- a/third_party/mojo/src/mojo/public/cpp/application/lib/service_registry.cc +++ b/mojo/application/public/cpp/lib/service_registry.cc @@ -2,11 +2,11 @@ // Use of this source code is governed by a BSD-style license that can be // found in the LICENSE file. -#include "mojo/public/cpp/application/lib/service_registry.h" +#include "mojo/application/public/cpp/lib/service_registry.h" -#include "mojo/public/cpp/application/application_connection.h" -#include "mojo/public/cpp/application/application_impl.h" -#include "mojo/public/cpp/application/service_connector.h" +#include "mojo/application/public/cpp/application_connection.h" +#include "mojo/application/public/cpp/application_impl.h" +#include "mojo/application/public/cpp/service_connector.h" namespace mojo { namespace internal { diff --git a/third_party/mojo/src/mojo/public/cpp/application/lib/service_registry.h b/mojo/application/public/cpp/lib/service_registry.h similarity index 84% rename from third_party/mojo/src/mojo/public/cpp/application/lib/service_registry.h rename to mojo/application/public/cpp/lib/service_registry.h index b303911d8941e5..9eee695f3e06c0 100644 --- a/third_party/mojo/src/mojo/public/cpp/application/lib/service_registry.h +++ b/mojo/application/public/cpp/lib/service_registry.h @@ -2,14 +2,14 @@ // Use of this source code is governed by a BSD-style license that can be // found in the LICENSE file. -#ifndef MOJO_PUBLIC_CPP_APPLICATION_LIB_SERVICE_REGISTRY_H_ -#define MOJO_PUBLIC_CPP_APPLICATION_LIB_SERVICE_REGISTRY_H_ +#ifndef MOJO_APPLICATION_PUBLIC_CPP_LIB_SERVICE_REGISTRY_H_ +#define MOJO_APPLICATION_PUBLIC_CPP_LIB_SERVICE_REGISTRY_H_ #include -#include "mojo/public/cpp/application/application_connection.h" -#include "mojo/public/cpp/application/lib/service_connector_registry.h" -#include "mojo/public/interfaces/application/service_provider.mojom.h" +#include "mojo/application/public/cpp/application_connection.h" +#include "mojo/application/public/cpp/lib/service_connector_registry.h" +#include "mojo/application/public/interfaces/service_provider.mojom.h" namespace mojo { @@ -64,4 +64,4 @@ class ServiceRegistry : public ServiceProvider, public ApplicationConnection { } // namespace internal } // namespace mojo -#endif // MOJO_PUBLIC_CPP_APPLICATION_LIB_SERVICE_REGISTRY_H_ +#endif // MOJO_APPLICATION_PUBLIC_CPP_LIB_SERVICE_REGISTRY_H_ diff --git a/third_party/mojo/src/mojo/public/cpp/application/service_connector.h b/mojo/application/public/cpp/service_connector.h similarity index 81% rename from third_party/mojo/src/mojo/public/cpp/application/service_connector.h rename to mojo/application/public/cpp/service_connector.h index 6dd6c86ae46fda..3a7d65681023ab 100644 --- a/third_party/mojo/src/mojo/public/cpp/application/service_connector.h +++ b/mojo/application/public/cpp/service_connector.h @@ -2,8 +2,8 @@ // Use of this source code is governed by a BSD-style license that can be // found in the LICENSE file. -#ifndef MOJO_PUBLIC_APPLICATION_SERVICE_CONNECTOR_H_ -#define MOJO_PUBLIC_APPLICATION_SERVICE_CONNECTOR_H_ +#ifndef MOJO_APPLICATION_PUBLIC_CPP_SERVICE_CONNECTOR_H_ +#define MOJO_APPLICATION_PUBLIC_CPP_SERVICE_CONNECTOR_H_ #include @@ -27,4 +27,4 @@ class ServiceConnector { } // namespace mojo -#endif // MOJO_PUBLIC_APPLICATION_SERVICE_CONNECTOR_H_ +#endif // MOJO_APPLICATION_PUBLIC_CPP_SERVICE_CONNECTOR_H_ diff --git a/third_party/mojo/src/mojo/public/cpp/application/service_provider_impl.h b/mojo/application/public/cpp/service_provider_impl.h similarity index 79% rename from third_party/mojo/src/mojo/public/cpp/application/service_provider_impl.h rename to mojo/application/public/cpp/service_provider_impl.h index ed4de3a9312f32..033bdaca971354 100644 --- a/third_party/mojo/src/mojo/public/cpp/application/service_provider_impl.h +++ b/mojo/application/public/cpp/service_provider_impl.h @@ -2,15 +2,15 @@ // Use of this source code is governed by a BSD-style license that can be // found in the LICENSE file. -#ifndef MOJO_PUBLIC_APPLICATION_SERVICE_PROVIDER_IMPL_H_ -#define MOJO_PUBLIC_APPLICATION_SERVICE_PROVIDER_IMPL_H_ +#ifndef MOJO_APPLICATION_PUBLIC_CPP_SERVICE_PROVIDER_IMPL_H_ +#define MOJO_APPLICATION_PUBLIC_CPP_SERVICE_PROVIDER_IMPL_H_ #include -#include "mojo/public/cpp/application/lib/interface_factory_connector.h" -#include "mojo/public/cpp/application/lib/service_connector_registry.h" +#include "mojo/application/public/cpp/lib/interface_factory_connector.h" +#include "mojo/application/public/cpp/lib/service_connector_registry.h" +#include "mojo/application/public/interfaces/service_provider.mojom.h" #include "mojo/public/cpp/bindings/binding.h" -#include "mojo/public/interfaces/application/service_provider.mojom.h" namespace mojo { @@ -50,4 +50,4 @@ class ServiceProviderImpl : public ServiceProvider { } // namespace mojo -#endif // MOJO_PUBLIC_APPLICATION_SERVICE_PROVIDER_IMPL_H_ +#endif // MOJO_APPLICATION_PUBLIC_CPP_SERVICE_PROVIDER_IMPL_H_ diff --git a/mojo/application/public/cpp/tests/BUILD.gn b/mojo/application/public/cpp/tests/BUILD.gn new file mode 100644 index 00000000000000..88690d00c65c78 --- /dev/null +++ b/mojo/application/public/cpp/tests/BUILD.gn @@ -0,0 +1,19 @@ +# 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("//testing/test.gni") + +test("mojo_public_application_unittests") { + sources = [ + "service_registry_unittest.cc", + ] + + deps = [ + "//mojo/application/public/cpp:standalone", + "//testing/gtest", + "//third_party/mojo/src/mojo/edk/test:run_all_unittests", + "//third_party/mojo/src/mojo/public/cpp/environment:standalone", + "//third_party/mojo/src/mojo/public/cpp/utility", + ] +} diff --git a/third_party/mojo/src/mojo/public/cpp/application/tests/service_registry_unittest.cc b/mojo/application/public/cpp/tests/service_registry_unittest.cc similarity index 94% rename from third_party/mojo/src/mojo/public/cpp/application/tests/service_registry_unittest.cc rename to mojo/application/public/cpp/tests/service_registry_unittest.cc index e0c5a9d3b90108..a746026da865f2 100644 --- a/third_party/mojo/src/mojo/public/cpp/application/tests/service_registry_unittest.cc +++ b/mojo/application/public/cpp/tests/service_registry_unittest.cc @@ -2,9 +2,9 @@ // Use of this source code is governed by a BSD-style license that can be // found in the LICENSE file. -#include "mojo/public/cpp/application/lib/service_registry.h" +#include "mojo/application/public/cpp/lib/service_registry.h" -#include "mojo/public/cpp/application/service_connector.h" +#include "mojo/application/public/cpp/service_connector.h" #include "testing/gtest/include/gtest/gtest.h" namespace mojo { diff --git a/third_party/mojo/src/mojo/public/interfaces/application/BUILD.gn b/mojo/application/public/interfaces/BUILD.gn similarity index 62% rename from third_party/mojo/src/mojo/public/interfaces/application/BUILD.gn rename to mojo/application/public/interfaces/BUILD.gn index 463df5580ea631..37d91b07336ac2 100644 --- a/third_party/mojo/src/mojo/public/interfaces/application/BUILD.gn +++ b/mojo/application/public/interfaces/BUILD.gn @@ -2,10 +2,10 @@ # Use of this source code is governed by a BSD-style license that can be # found in the LICENSE file. -import("../../tools/bindings/mojom.gni") +import("//third_party/mojo/src/mojo/public/tools/bindings/mojom.gni") -# GYP version: mojo/public/mojo_public.gyp:mojo_application_bindings -mojom("application") { +# GYP version: mojo/mojo_base.gyp:mojo_application_bindings +mojom("interfaces") { sources = [ "application.mojom", "service_provider.mojom", diff --git a/third_party/mojo/src/mojo/public/interfaces/application/application.mojom b/mojo/application/public/interfaces/application.mojom similarity index 95% rename from third_party/mojo/src/mojo/public/interfaces/application/application.mojom rename to mojo/application/public/interfaces/application.mojom index eaa742d0651b74..dc9f2f63380748 100644 --- a/third_party/mojo/src/mojo/public/interfaces/application/application.mojom +++ b/mojo/application/public/interfaces/application.mojom @@ -4,8 +4,8 @@ module mojo; -import "mojo/public/interfaces/application/service_provider.mojom"; -import "mojo/public/interfaces/application/shell.mojom"; +import "mojo/application/public/interfaces/service_provider.mojom"; +import "mojo/application/public/interfaces/shell.mojom"; // This is the primary interface implemented by every Mojo application. It // allows the application to receive its startup arguments from the shell, and diff --git a/third_party/mojo/src/mojo/public/interfaces/application/service_provider.mojom b/mojo/application/public/interfaces/service_provider.mojom similarity index 100% rename from third_party/mojo/src/mojo/public/interfaces/application/service_provider.mojom rename to mojo/application/public/interfaces/service_provider.mojom diff --git a/third_party/mojo/src/mojo/public/interfaces/application/shell.mojom b/mojo/application/public/interfaces/shell.mojom similarity index 96% rename from third_party/mojo/src/mojo/public/interfaces/application/shell.mojom rename to mojo/application/public/interfaces/shell.mojom index 523e2637bd787e..b6b131924070a1 100644 --- a/third_party/mojo/src/mojo/public/interfaces/application/shell.mojom +++ b/mojo/application/public/interfaces/shell.mojom @@ -4,7 +4,7 @@ module mojo; -import "mojo/public/interfaces/application/service_provider.mojom"; +import "mojo/application/public/interfaces/service_provider.mojom"; // An interface through which a Mojo application may communicate with the Mojo // system and request connections to other applications. diff --git a/mojo/common/BUILD.gn b/mojo/common/BUILD.gn index 8f5dfaa0a4a7d1..c6225bbba671b7 100644 --- a/mojo/common/BUILD.gn +++ b/mojo/common/BUILD.gn @@ -91,9 +91,9 @@ if (!is_component_build) { deps = [ "//base", - "//third_party/mojo/src/mojo/public/cpp/application", - "//third_party/mojo/src/mojo/public/cpp/bindings", + "//mojo/application/public/cpp:application", "//mojo/services/tracing:bindings", + "//third_party/mojo/src/mojo/public/cpp/bindings", ] } } diff --git a/mojo/common/DEPS b/mojo/common/DEPS index 81bd86ce63032a..9db849be80b80e 100644 --- a/mojo/common/DEPS +++ b/mojo/common/DEPS @@ -1,6 +1,7 @@ include_rules = [ # common must not depend on embedder. "-mojo", + "+mojo/application/public/cpp", "+mojo/common", "+third_party/mojo/src/mojo/public", ] diff --git a/mojo/common/trace_controller_impl.cc b/mojo/common/trace_controller_impl.cc index 178f4cddb89a91..f364e5b819036c 100644 --- a/mojo/common/trace_controller_impl.cc +++ b/mojo/common/trace_controller_impl.cc @@ -5,8 +5,8 @@ #include "mojo/common/trace_controller_impl.h" #include "base/trace_event/trace_event.h" -#include "third_party/mojo/src/mojo/public/cpp/application/application_connection.h" -#include "third_party/mojo/src/mojo/public/cpp/application/application_impl.h" +#include "mojo/application/public/cpp/application_connection.h" +#include "mojo/application/public/cpp/application_impl.h" namespace mojo { diff --git a/mojo/common/tracing_impl.cc b/mojo/common/tracing_impl.cc index 420a4755bd2858..29a520d7c42793 100644 --- a/mojo/common/tracing_impl.cc +++ b/mojo/common/tracing_impl.cc @@ -5,9 +5,9 @@ #include "mojo/common/tracing_impl.h" #include "base/trace_event/trace_event.h" +#include "mojo/application/public/cpp/application_connection.h" +#include "mojo/application/public/cpp/application_impl.h" #include "mojo/common/trace_controller_impl.h" -#include "third_party/mojo/src/mojo/public/cpp/application/application_connection.h" -#include "third_party/mojo/src/mojo/public/cpp/application/application_impl.h" namespace mojo { diff --git a/mojo/common/tracing_impl.h b/mojo/common/tracing_impl.h index c9118e2536fca7..d159b015385878 100644 --- a/mojo/common/tracing_impl.h +++ b/mojo/common/tracing_impl.h @@ -6,8 +6,8 @@ #define MOJO_COMMON_TRACING_IMPL_H_ #include "base/macros.h" +#include "mojo/application/public/cpp/interface_factory.h" #include "mojo/services/tracing/tracing.mojom.h" -#include "third_party/mojo/src/mojo/public/cpp/application/interface_factory.h" namespace mojo { diff --git a/mojo/mojo_base.gyp b/mojo/mojo_base.gyp index c40a9499e8a03a..b514cd5d24ea41 100644 --- a/mojo/mojo_base.gyp +++ b/mojo/mojo_base.gyp @@ -181,14 +181,100 @@ 'application/application_runner_chromium.h', ], 'dependencies': [ + 'mojo_application_base', 'mojo_common_lib', 'mojo_environment_chromium', - '../third_party/mojo/mojo_public.gyp:mojo_application_base', ], 'export_dependent_settings': [ - '../third_party/mojo/mojo_public.gyp:mojo_application_base', + 'mojo_application_base', ], }, + { + 'target_name': 'mojo_application_bindings_mojom', + 'type': 'none', + 'variables': { + 'mojom_files': [ + 'application/public/interfaces/application.mojom', + 'application/public/interfaces/service_provider.mojom', + 'application/public/interfaces/shell.mojom', + ], + }, + 'includes': [ '../third_party/mojo/mojom_bindings_generator_explicit.gypi' ], + }, + { + # GN version: //mojo/application/public/cpp + 'target_name': 'mojo_application_base', + 'type': 'static_library', + 'sources': [ + 'application/public/cpp/application_connection.h', + 'application/public/cpp/application_delegate.h', + 'application/public/cpp/application_impl.h', + 'application/public/cpp/connect.h', + 'application/public/cpp/interface_factory.h', + 'application/public/cpp/interface_factory_impl.h', + 'application/public/cpp/lib/application_connection.cc', + 'application/public/cpp/lib/application_delegate.cc', + 'application/public/cpp/lib/application_impl.cc', + 'application/public/cpp/lib/interface_factory_connector.h', + 'application/public/cpp/lib/service_connector_registry.cc', + 'application/public/cpp/lib/service_connector_registry.h', + 'application/public/cpp/lib/service_provider_impl.cc', + 'application/public/cpp/lib/service_registry.cc', + 'application/public/cpp/lib/service_registry.h', + 'application/public/cpp/service_connector.h', + 'application/public/cpp/service_provider_impl.h', + ], + 'dependencies': [ + 'mojo_application_bindings', + ], + 'export_dependent_settings': [ + 'mojo_application_bindings', + ], + }, + { + # GN version: //mojo/application/public/cpp:standalone + 'target_name': 'mojo_application_standalone', + 'type': 'static_library', + 'sources': [ + 'application/public/cpp/lib/application_runner.cc', + 'application/public/cpp/application_runner.h', + ], + 'dependencies': [ + 'mojo_application_base', + '../third_party/mojo/mojo_public.gyp:mojo_environment_standalone', + ], + 'export_dependent_settings': [ + 'mojo_application_base', + ], + }, + { + # GN version: //mojo/public/interfaces/application:application + 'target_name': 'mojo_application_bindings', + 'type': 'static_library', + 'dependencies': [ + 'mojo_application_bindings_mojom', + '../third_party/mojo/mojo_public.gyp:mojo_cpp_bindings', + ], + 'export_dependent_settings': [ + '../third_party/mojo/mojo_public.gyp:mojo_cpp_bindings', + ], + }, + { + # GN version: //mojo/application/public/cpp/tests + 'target_name': 'mojo_public_application_unittests', + 'type': 'executable', + 'dependencies': [ + 'mojo_application_standalone', + '../base/base.gyp:base', + '../testing/gtest.gyp:gtest', + '../third_party/mojo/mojo_edk.gyp:mojo_run_all_unittests', + '../third_party/mojo/mojo_public.gyp:mojo_utility', + '../third_party/mojo/mojo_public.gyp:mojo_environment_standalone', + ], + 'sources': [ + 'application/public/cpp/tests/service_registry_unittest.cc', + ], + }, ], 'conditions': [ ['OS=="android"', { diff --git a/mojo/runner/BUILD.gn b/mojo/runner/BUILD.gn index c06dd8c910dde9..165a9b513b5f31 100644 --- a/mojo/runner/BUILD.gn +++ b/mojo/runner/BUILD.gn @@ -122,12 +122,12 @@ source_set("lib") { "//base/third_party/dynamic_annotations", "//base:base_static", "//mojo/application", + "//mojo/application/public/interfaces", "//mojo/common", "//mojo/common:tracing_impl", "//mojo/util:filename_util", "//third_party/mojo/src/mojo/edk/system", "//third_party/mojo/src/mojo/public/cpp/bindings", - "//third_party/mojo/src/mojo/public/interfaces/application", "//mojo/services/network/public/interfaces", "//mojo/shell", "//mojo/services/tracing:bindings", @@ -359,7 +359,7 @@ mojom("child_process_bindings") { ] deps = [ - "//third_party/mojo/src/mojo/public/interfaces/application", + "//mojo/application/public/interfaces", ] } diff --git a/mojo/runner/android/android_handler.cc b/mojo/runner/android/android_handler.cc index 7ab108e3433941..29d3746c7da36a 100644 --- a/mojo/runner/android/android_handler.cc +++ b/mojo/runner/android/android_handler.cc @@ -10,9 +10,9 @@ #include "base/logging.h" #include "base/scoped_native_library.h" #include "jni/AndroidHandler_jni.h" +#include "mojo/application/public/cpp/application_impl.h" #include "mojo/common/data_pipe_utils.h" #include "mojo/public/c/system/main.h" -#include "mojo/public/cpp/application/application_impl.h" #include "mojo/runner/android/run_android_application_function.h" #include "mojo/runner/native_application_support.h" diff --git a/mojo/runner/android/android_handler.h b/mojo/runner/android/android_handler.h index ad0e89729d306d..0bb3ff5dc123d2 100644 --- a/mojo/runner/android/android_handler.h +++ b/mojo/runner/android/android_handler.h @@ -8,8 +8,8 @@ #include #include "mojo/application/content_handler_factory.h" -#include "mojo/public/cpp/application/application_delegate.h" -#include "mojo/public/cpp/application/interface_factory_impl.h" +#include "mojo/application/public/cpp/application_delegate.h" +#include "mojo/application/public/cpp/interface_factory_impl.h" #include "third_party/mojo_services/src/content_handler/public/interfaces/content_handler.mojom.h" namespace base { diff --git a/mojo/runner/android/android_handler_loader.h b/mojo/runner/android/android_handler_loader.h index 8979790bffc175..24ada8d9a12122 100644 --- a/mojo/runner/android/android_handler_loader.h +++ b/mojo/runner/android/android_handler_loader.h @@ -8,7 +8,7 @@ #include "base/containers/scoped_ptr_hash_map.h" #include "base/macros.h" #include "base/memory/scoped_ptr.h" -#include "mojo/public/cpp/application/application_impl.h" +#include "mojo/application/public/cpp/application_impl.h" #include "mojo/runner/android/android_handler.h" #include "mojo/shell/application_loader.h" diff --git a/mojo/runner/android/background_application_loader_unittest.cc b/mojo/runner/android/background_application_loader_unittest.cc index 19947fe0bedeea..ac24ae5054309b 100644 --- a/mojo/runner/android/background_application_loader_unittest.cc +++ b/mojo/runner/android/background_application_loader_unittest.cc @@ -4,7 +4,7 @@ #include "mojo/runner/android/background_application_loader.h" -#include "mojo/public/interfaces/application/application.mojom.h" +#include "mojo/application/public/interfaces/application.mojom.h" #include "testing/gtest/include/gtest/gtest.h" namespace mojo { diff --git a/mojo/runner/android/native_viewport_application_loader.cc b/mojo/runner/android/native_viewport_application_loader.cc index 815cc05374af77..459f08a9434954 100644 --- a/mojo/runner/android/native_viewport_application_loader.cc +++ b/mojo/runner/android/native_viewport_application_loader.cc @@ -6,7 +6,7 @@ #include "components/gles2/gpu_state.h" #include "components/native_viewport/native_viewport_impl.h" -#include "mojo/public/cpp/application/application_impl.h" +#include "mojo/application/public/cpp/application_impl.h" namespace mojo { namespace runner { diff --git a/mojo/runner/android/native_viewport_application_loader.h b/mojo/runner/android/native_viewport_application_loader.h index b71400893046a9..a4c3c121752130 100644 --- a/mojo/runner/android/native_viewport_application_loader.h +++ b/mojo/runner/android/native_viewport_application_loader.h @@ -8,8 +8,8 @@ #include "components/gles2/gpu_impl.h" #include "components/gpu/public/interfaces/gpu.mojom.h" #include "components/native_viewport/public/interfaces/native_viewport.mojom.h" -#include "mojo/public/cpp/application/application_delegate.h" -#include "mojo/public/cpp/application/interface_factory.h" +#include "mojo/application/public/cpp/application_delegate.h" +#include "mojo/application/public/cpp/interface_factory.h" #include "mojo/shell/application_loader.h" namespace gles2 { diff --git a/mojo/runner/child_process.mojom b/mojo/runner/child_process.mojom index cf83281257266e..da461c9c3e34d7 100644 --- a/mojo/runner/child_process.mojom +++ b/mojo/runner/child_process.mojom @@ -4,7 +4,7 @@ module mojo.runner; -import "mojo/public/interfaces/application/application.mojom"; +import "mojo/application/public/interfaces/application.mojom"; interface ChildController { // Starts the app at the given path (deleting it if |clean_app_path| is true). diff --git a/mojo/runner/context.cc b/mojo/runner/context.cc index b22d8057427fa0..adccbfa362d8fc 100644 --- a/mojo/runner/context.cc +++ b/mojo/runner/context.cc @@ -19,13 +19,13 @@ #include "base/strings/string_util.h" #include "base/trace_event/trace_event.h" #include "build/build_config.h" +#include "mojo/application/public/cpp/application_connection.h" +#include "mojo/application/public/cpp/application_delegate.h" +#include "mojo/application/public/cpp/application_impl.h" #include "mojo/common/trace_controller_impl.h" #include "mojo/common/tracing_impl.h" #include "mojo/edk/embedder/embedder.h" #include "mojo/edk/embedder/simple_platform_support.h" -#include "mojo/public/cpp/application/application_connection.h" -#include "mojo/public/cpp/application/application_delegate.h" -#include "mojo/public/cpp/application/application_impl.h" #include "mojo/runner/in_process_native_runner.h" #include "mojo/runner/out_of_process_native_runner.h" #include "mojo/runner/switches.h" diff --git a/mojo/runner/shell_apptest.cc b/mojo/runner/shell_apptest.cc index 35ad11d5207b41..c0ac9c9d973663 100644 --- a/mojo/runner/shell_apptest.cc +++ b/mojo/runner/shell_apptest.cc @@ -11,8 +11,8 @@ #include "base/strings/string_util.h" #include "base/strings/stringprintf.h" #include "mojo/application/application_test_base_chromium.h" +#include "mojo/application/public/cpp/application_impl.h" #include "mojo/common/data_pipe_utils.h" -#include "mojo/public/cpp/application/application_impl.h" #include "mojo/public/cpp/system/macros.h" #include "mojo/runner/kPingable.h" #include "mojo/runner/test/pingable.mojom.h" diff --git a/mojo/runner/test/BUILD.gn b/mojo/runner/test/BUILD.gn index 7ca52ff8dd6824..96a78484516224 100644 --- a/mojo/runner/test/BUILD.gn +++ b/mojo/runner/test/BUILD.gn @@ -20,7 +20,7 @@ mojo_native_application("pingable_app") { deps = [ ":bindings", - "//third_party/mojo/src/mojo/public/cpp/application:standalone", + "//mojo/application/public/cpp:application", "//third_party/mojo/src/mojo/public/cpp/bindings:callback", "//third_party/mojo/src/mojo/public/cpp/environment", "//third_party/mojo/src/mojo/public/cpp/system", diff --git a/mojo/runner/test/pingable_app.cc b/mojo/runner/test/pingable_app.cc index f62dd2e3eb542a..2930a51e2cd2f6 100644 --- a/mojo/runner/test/pingable_app.cc +++ b/mojo/runner/test/pingable_app.cc @@ -2,11 +2,11 @@ // Use of this source code is governed by a BSD-style license that can be // found in the LICENSE file. +#include "mojo/application/public/cpp/application_delegate.h" +#include "mojo/application/public/cpp/application_impl.h" +#include "mojo/application/public/cpp/application_runner.h" +#include "mojo/application/public/cpp/interface_factory.h" #include "mojo/public/c/system/main.h" -#include "mojo/public/cpp/application/application_delegate.h" -#include "mojo/public/cpp/application/application_impl.h" -#include "mojo/public/cpp/application/application_runner.h" -#include "mojo/public/cpp/application/interface_factory.h" #include "mojo/public/cpp/bindings/callback.h" #include "mojo/public/cpp/bindings/interface_request.h" #include "mojo/public/cpp/bindings/strong_binding.h" diff --git a/mojo/services/network/network_service_delegate.cc b/mojo/services/network/network_service_delegate.cc index d608b33dd8a188..4884314046cf8f 100644 --- a/mojo/services/network/network_service_delegate.cc +++ b/mojo/services/network/network_service_delegate.cc @@ -9,7 +9,7 @@ #include "base/files/file_path.h" #include "base/message_loop/message_loop.h" #include "base/path_service.h" -#include "third_party/mojo/src/mojo/public/cpp/application/application_connection.h" +#include "mojo/application/public/cpp/application_connection.h" NetworkServiceDelegate::NetworkServiceDelegate() {} diff --git a/mojo/services/network/network_service_delegate.h b/mojo/services/network/network_service_delegate.h index b8f61c285c96d4..570f5951e3f6be 100644 --- a/mojo/services/network/network_service_delegate.h +++ b/mojo/services/network/network_service_delegate.h @@ -5,11 +5,11 @@ #ifndef MOJO_SERVICES_NETWORK_NETWORK_SERVICE_DELEGATE_H_ #define MOJO_SERVICES_NETWORK_NETWORK_SERVICE_DELEGATE_H_ -#include "mojo/public/cpp/application/application_impl.h" +#include "mojo/application/public/cpp/application_delegate.h" +#include "mojo/application/public/cpp/application_impl.h" +#include "mojo/application/public/cpp/interface_factory.h" #include "mojo/services/network/network_context.h" #include "mojo/services/network/network_service_impl.h" -#include "third_party/mojo/src/mojo/public/cpp/application/application_delegate.h" -#include "third_party/mojo/src/mojo/public/cpp/application/interface_factory.h" #include "third_party/mojo/src/mojo/public/cpp/bindings/interface_ptr.h" class NetworkServiceDelegate diff --git a/mojo/services/network/network_service_impl.cc b/mojo/services/network/network_service_impl.cc index 48f54968b9ce57..20c255876d65ec 100644 --- a/mojo/services/network/network_service_impl.cc +++ b/mojo/services/network/network_service_impl.cc @@ -4,6 +4,7 @@ #include "mojo/services/network/network_service_impl.h" +#include "mojo/application/public/cpp/application_connection.h" #include "mojo/services/network/cookie_store_impl.h" #include "mojo/services/network/http_server_impl.h" #include "mojo/services/network/net_adapters.h" @@ -11,7 +12,6 @@ #include "mojo/services/network/udp_socket_impl.h" #include "mojo/services/network/url_loader_impl.h" #include "mojo/services/network/web_socket_impl.h" -#include "third_party/mojo/src/mojo/public/cpp/application/application_connection.h" namespace mojo { diff --git a/mojo/services/network/udp_socket_apptest.cc b/mojo/services/network/udp_socket_apptest.cc index d9aa2040b33872..1a8cc3ca04748f 100644 --- a/mojo/services/network/udp_socket_apptest.cc +++ b/mojo/services/network/udp_socket_apptest.cc @@ -6,8 +6,8 @@ #include "base/memory/scoped_ptr.h" #include "base/run_loop.h" #include "mojo/application/application_test_base_chromium.h" -#include "mojo/public/cpp/application/application_connection.h" -#include "mojo/public/cpp/application/application_impl.h" +#include "mojo/application/public/cpp/application_connection.h" +#include "mojo/application/public/cpp/application_impl.h" #include "mojo/public/cpp/bindings/callback.h" #include "mojo/services/network/public/cpp/udp_socket_wrapper.h" #include "mojo/services/network/public/interfaces/network_service.mojom.h" diff --git a/mojo/services/test_service/BUILD.gn b/mojo/services/test_service/BUILD.gn index 6d61602b5cf84b..d91096f39a701e 100644 --- a/mojo/services/test_service/BUILD.gn +++ b/mojo/services/test_service/BUILD.gn @@ -38,8 +38,8 @@ mojo_native_application("test_app") { ":bindings", "//base", "//base:i18n", - "//third_party/mojo/src/mojo/public/cpp/application", - "//third_party/mojo/src/mojo/public/cpp/application:standalone", + "//mojo/application/public/cpp:application", + "//mojo/application/public/cpp:standalone", "//third_party/mojo/src/mojo/public/cpp/bindings", "//third_party/mojo/src/mojo/public/cpp/system", "//third_party/mojo/src/mojo/public/cpp/utility", @@ -62,8 +62,8 @@ mojo_native_application("test_request_tracker_app") { ":bindings", "//base", "//base:i18n", - "//third_party/mojo/src/mojo/public/cpp/application", - "//third_party/mojo/src/mojo/public/cpp/application:standalone", + "//mojo/application/public/cpp:application", + "//mojo/application/public/cpp:standalone", "//third_party/mojo/src/mojo/public/cpp/bindings", "//third_party/mojo/src/mojo/public/cpp/system", "//third_party/mojo/src/mojo/public/cpp/utility", diff --git a/mojo/services/test_service/DEPS b/mojo/services/test_service/DEPS new file mode 100644 index 00000000000000..e402e7fc25e194 --- /dev/null +++ b/mojo/services/test_service/DEPS @@ -0,0 +1,3 @@ +include_rules = [ + "+mojo/application/public/cpp", +] diff --git a/mojo/services/test_service/test_request_tracker_application.cc b/mojo/services/test_service/test_request_tracker_application.cc index 2fcf1f36a9a049..6facdc56fbd68b 100644 --- a/mojo/services/test_service/test_request_tracker_application.cc +++ b/mojo/services/test_service/test_request_tracker_application.cc @@ -6,9 +6,9 @@ #include +#include "mojo/application/public/cpp/application_connection.h" +#include "mojo/application/public/cpp/application_runner.h" #include "mojo/public/c/system/main.h" -#include "mojo/public/cpp/application/application_connection.h" -#include "mojo/public/cpp/application/application_runner.h" #include "mojo/services/test_service/test_time_service_impl.h" namespace mojo { diff --git a/mojo/services/test_service/test_request_tracker_application.h b/mojo/services/test_service/test_request_tracker_application.h index 761a8455fc14b5..a009f628e7d882 100644 --- a/mojo/services/test_service/test_request_tracker_application.h +++ b/mojo/services/test_service/test_request_tracker_application.h @@ -5,8 +5,8 @@ #ifndef SERVICES_TEST_SERVICE_TEST_REQUEST_TRACKER_APPLICATION_H_ #define SERVICES_TEST_SERVICE_TEST_REQUEST_TRACKER_APPLICATION_H_ -#include "mojo/public/cpp/application/application_delegate.h" -#include "mojo/public/cpp/application/interface_factory_impl.h" +#include "mojo/application/public/cpp/application_delegate.h" +#include "mojo/application/public/cpp/interface_factory_impl.h" #include "mojo/public/cpp/system/macros.h" #include "mojo/services/test_service/test_request_tracker_impl.h" diff --git a/mojo/services/test_service/test_service_application.cc b/mojo/services/test_service/test_service_application.cc index 70a2824e993602..610e0cbf6c6ed7 100644 --- a/mojo/services/test_service/test_service_application.cc +++ b/mojo/services/test_service/test_service_application.cc @@ -6,9 +6,9 @@ #include +#include "mojo/application/public/cpp/application_connection.h" +#include "mojo/application/public/cpp/application_runner.h" #include "mojo/public/c/system/main.h" -#include "mojo/public/cpp/application/application_connection.h" -#include "mojo/public/cpp/application/application_runner.h" #include "mojo/public/cpp/utility/run_loop.h" #include "mojo/services/test_service/test_service_impl.h" #include "mojo/services/test_service/test_time_service_impl.h" diff --git a/mojo/services/test_service/test_service_application.h b/mojo/services/test_service/test_service_application.h index 6b36f07ab90b5b..4ad5559ea0d1b6 100644 --- a/mojo/services/test_service/test_service_application.h +++ b/mojo/services/test_service/test_service_application.h @@ -5,8 +5,8 @@ #ifndef SERVICES_TEST_SERVICE_TEST_SERVICE_APPLICATION_H_ #define SERVICES_TEST_SERVICE_TEST_SERVICE_APPLICATION_H_ -#include "mojo/public/cpp/application/application_delegate.h" -#include "mojo/public/cpp/application/interface_factory.h" +#include "mojo/application/public/cpp/application_delegate.h" +#include "mojo/application/public/cpp/interface_factory.h" #include "mojo/public/cpp/system/macros.h" namespace mojo { diff --git a/mojo/services/test_service/test_service_impl.cc b/mojo/services/test_service/test_service_impl.cc index de913ebafb0a87..35af1937997781 100644 --- a/mojo/services/test_service/test_service_impl.cc +++ b/mojo/services/test_service/test_service_impl.cc @@ -7,7 +7,7 @@ #include "base/bind.h" #include "base/i18n/time_formatting.h" #include "base/strings/utf_string_conversions.h" -#include "mojo/public/cpp/application/application_impl.h" +#include "mojo/application/public/cpp/application_impl.h" #include "mojo/services/test_service/test_service_application.h" #include "mojo/services/test_service/test_time_service_impl.h" #include "mojo/services/test_service/tracked_service.h" diff --git a/mojo/services/test_service/test_time_service_impl.cc b/mojo/services/test_service/test_time_service_impl.cc index d11d346ad8558a..ae26a8ea57d5bb 100644 --- a/mojo/services/test_service/test_time_service_impl.cc +++ b/mojo/services/test_service/test_time_service_impl.cc @@ -3,7 +3,7 @@ // found in the LICENSE file. #include "base/time/time.h" -#include "mojo/public/cpp/application/application_impl.h" +#include "mojo/application/public/cpp/application_impl.h" #include "mojo/services/test_service/test_request_tracker.mojom.h" #include "mojo/services/test_service/test_time_service_impl.h" #include "mojo/services/test_service/tracked_service.h" diff --git a/mojo/services/tracing/BUILD.gn b/mojo/services/tracing/BUILD.gn index e22a7cb563bdaf..337b10a59eec3e 100644 --- a/mojo/services/tracing/BUILD.gn +++ b/mojo/services/tracing/BUILD.gn @@ -12,7 +12,7 @@ mojo_native_application("tracing") { deps = [ ":lib", - "//third_party/mojo/src/mojo/public/cpp/application", + "//mojo/application/public/cpp:application", "//third_party/mojo/src/mojo/public/cpp/system", ] } diff --git a/mojo/services/tracing/main.cc b/mojo/services/tracing/main.cc index 336fd2cc5abf3a..b0717ef46a3e3a 100644 --- a/mojo/services/tracing/main.cc +++ b/mojo/services/tracing/main.cc @@ -3,8 +3,8 @@ // found in the LICENSE file. #include "mojo/application/application_runner_chromium.h" +#include "mojo/application/public/cpp/application_impl.h" #include "mojo/public/c/system/main.h" -#include "mojo/public/cpp/application/application_impl.h" #include "mojo/services/tracing/tracing_app.h" MojoResult MojoMain(MojoHandle shell_handle) { diff --git a/mojo/services/tracing/tracing_app.cc b/mojo/services/tracing/tracing_app.cc index 8c1cb514fbb078..5409799f2086e1 100644 --- a/mojo/services/tracing/tracing_app.cc +++ b/mojo/services/tracing/tracing_app.cc @@ -6,8 +6,8 @@ #include "base/bind.h" #include "base/message_loop/message_loop.h" +#include "mojo/application/public/cpp/application_connection.h" #include "mojo/services/tracing/trace_data_sink.h" -#include "third_party/mojo/src/mojo/public/cpp/application/application_connection.h" namespace tracing { diff --git a/mojo/services/tracing/tracing_app.h b/mojo/services/tracing/tracing_app.h index 2f440d3ce1be75..f652c29c96181e 100644 --- a/mojo/services/tracing/tracing_app.h +++ b/mojo/services/tracing/tracing_app.h @@ -6,12 +6,12 @@ #define MOJO_SERVICES_TRACING_TRACING_APP_H_ #include "base/memory/scoped_vector.h" +#include "mojo/application/public/cpp/application_delegate.h" +#include "mojo/application/public/cpp/interface_factory.h" #include "mojo/common/weak_binding_set.h" #include "mojo/common/weak_interface_ptr_set.h" -#include "mojo/public/cpp/application/application_delegate.h" #include "mojo/public/cpp/bindings/strong_binding.h" #include "mojo/services/tracing/tracing.mojom.h" -#include "third_party/mojo/src/mojo/public/cpp/application/interface_factory.h" namespace tracing { diff --git a/mojo/shell/BUILD.gn b/mojo/shell/BUILD.gn index 66a8d750a3fdd9..8b5fe28da215fd 100644 --- a/mojo/shell/BUILD.gn +++ b/mojo/shell/BUILD.gn @@ -32,9 +32,9 @@ source_set("shell") { public_deps = [ "//base", + "//mojo/application/public/interfaces", "//mojo/common", "//third_party/mojo/src/mojo/public/cpp/bindings", - "//third_party/mojo/src/mojo/public/interfaces/application:application", "//mojo/services/network/public/interfaces", "//url", ] @@ -61,10 +61,10 @@ test("tests") { ":test_bindings", "//base", "//mojo/application", + "//mojo/application/public/cpp:application", "//mojo/common", - "//third_party/mojo/src/mojo/edk/test:run_all_unittests", "//mojo/environment:chromium", - "//third_party/mojo/src/mojo/public/cpp/application", + "//third_party/mojo/src/mojo/edk/test:run_all_unittests", "//third_party/mojo/src/mojo/public/cpp/bindings", "//testing/gtest", "//url", diff --git a/mojo/shell/application_loader.h b/mojo/shell/application_loader.h index 11feb381b6745b..f464ab1305a532 100644 --- a/mojo/shell/application_loader.h +++ b/mojo/shell/application_loader.h @@ -6,8 +6,8 @@ #define SHELL_APPLICATION_MANAGER_APPLICATION_LOADER_H_ #include "base/callback.h" +#include "mojo/application/public/interfaces/shell.mojom.h" #include "mojo/public/cpp/system/core.h" -#include "mojo/public/interfaces/application/shell.mojom.h" #include "mojo/services/network/public/interfaces/url_loader.mojom.h" #include "url/gurl.h" diff --git a/mojo/shell/application_manager.h b/mojo/shell/application_manager.h index ffc798af46348e..a5ebda31844b7a 100644 --- a/mojo/shell/application_manager.h +++ b/mojo/shell/application_manager.h @@ -11,10 +11,10 @@ #include "base/memory/scoped_ptr.h" #include "base/memory/scoped_vector.h" #include "base/memory/weak_ptr.h" +#include "mojo/application/public/interfaces/application.mojom.h" +#include "mojo/application/public/interfaces/service_provider.mojom.h" #include "mojo/public/cpp/bindings/interface_ptr_info.h" #include "mojo/public/cpp/bindings/interface_request.h" -#include "mojo/public/interfaces/application/application.mojom.h" -#include "mojo/public/interfaces/application/service_provider.mojom.h" #include "mojo/services/network/public/interfaces/network_service.mojom.h" #include "mojo/shell/application_loader.h" #include "mojo/shell/fetcher.h" diff --git a/mojo/shell/application_manager_unittest.cc b/mojo/shell/application_manager_unittest.cc index d77a9aad84a7de..e08420dd9792bc 100644 --- a/mojo/shell/application_manager_unittest.cc +++ b/mojo/shell/application_manager_unittest.cc @@ -7,12 +7,12 @@ #include "base/macros.h" #include "base/memory/scoped_vector.h" #include "base/message_loop/message_loop.h" -#include "mojo/public/cpp/application/application_connection.h" -#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/application/public/cpp/application_connection.h" +#include "mojo/application/public/cpp/application_delegate.h" +#include "mojo/application/public/cpp/application_impl.h" +#include "mojo/application/public/cpp/interface_factory.h" +#include "mojo/application/public/interfaces/service_provider.mojom.h" #include "mojo/public/cpp/bindings/strong_binding.h" -#include "mojo/public/interfaces/application/service_provider.mojom.h" #include "mojo/shell/application_loader.h" #include "mojo/shell/application_manager.h" #include "mojo/shell/fetcher.h" diff --git a/mojo/shell/native_runner.h b/mojo/shell/native_runner.h index 8ceb5d53c54654..ad89f4431e3a38 100644 --- a/mojo/shell/native_runner.h +++ b/mojo/shell/native_runner.h @@ -7,8 +7,8 @@ #include "base/callback_forward.h" #include "base/memory/scoped_ptr.h" +#include "mojo/application/public/interfaces/application.mojom.h" #include "third_party/mojo/src/mojo/public/cpp/bindings/interface_request.h" -#include "third_party/mojo/src/mojo/public/interfaces/application/application.mojom.h" #if defined(OS_WIN) #undef DELETE diff --git a/mojo/shell/shell_impl.h b/mojo/shell/shell_impl.h index cf8be59d821333..0f2d97488eeb15 100644 --- a/mojo/shell/shell_impl.h +++ b/mojo/shell/shell_impl.h @@ -6,10 +6,10 @@ #define MOJO_SHELL_SHELL_IMPL_H_ #include "base/callback.h" +#include "mojo/application/public/interfaces/application.mojom.h" +#include "mojo/application/public/interfaces/shell.mojom.h" #include "mojo/public/cpp/bindings/binding.h" #include "mojo/public/cpp/bindings/error_handler.h" -#include "mojo/public/interfaces/application/application.mojom.h" -#include "mojo/public/interfaces/application/shell.mojom.h" #include "mojo/shell/identity.h" #include "url/gurl.h" diff --git a/mojo/tools/rev_sdk.py b/mojo/tools/rev_sdk.py index c5cefbca8725f8..a33c37eb399177 100755 --- a/mojo/tools/rev_sdk.py +++ b/mojo/tools/rev_sdk.py @@ -20,6 +20,11 @@ "nacl_bindings", ] +sdk_dirs_to_not_clone = [ + "mojo/public/cpp/application", + "mojo/public/interfaces/application", +] + # Individual files to preserve within the target repository during roll. These # are relative to |sdk_prefix_in_chromium| but are not maintained in the mojo # repository. @@ -52,6 +57,14 @@ def rev(source_dir, chromium_dir): if os.path.basename(f) == "PRESUBMIT.py": continue + exclude = False + for excluded in sdk_dirs_to_not_clone: + if f.startswith(excluded): + exclude = True + break + if exclude: + continue + # Clone |f| into Chromium under |dest_dir| at its location relative to # |input_dir|. f_relpath = os.path.relpath(f, input_dir) diff --git a/third_party/mojo/mojo_edk_tests.gyp b/third_party/mojo/mojo_edk_tests.gyp index 9b9f99358c9511..dc552e23f2dd94 100644 --- a/third_party/mojo/mojo_edk_tests.gyp +++ b/third_party/mojo/mojo_edk_tests.gyp @@ -17,7 +17,6 @@ # target on iOS due to the presence of the js targets, which cause v8 # to be built. 'mojo_message_pipe_perftests', - 'mojo_public_application_unittests', 'mojo_public_bindings_unittests', 'mojo_public_environment_unittests', 'mojo_public_system_perftests', @@ -82,22 +81,6 @@ 'src/mojo/public/cpp/environment/tests/logging_unittest.cc', ], }, - { - # GN version: //mojo/edk/test:mojo_public_application_unittests - 'target_name': 'mojo_public_application_unittests', - 'type': 'executable', - 'dependencies': [ - '../../base/base.gyp:base', - '../../testing/gtest.gyp:gtest', - 'mojo_edk.gyp:mojo_run_all_unittests', - 'mojo_public.gyp:mojo_application_standalone', - 'mojo_public.gyp:mojo_utility', - 'mojo_public.gyp:mojo_environment_standalone', - ], - 'sources': [ - 'src/mojo/public/cpp/application/tests/service_registry_unittest.cc', - ], - }, { # GN version: //mojo/public/cpp/system/tests:mojo_public_system_unittests # and //mojo/public/c/system/tests diff --git a/third_party/mojo/mojo_public.gyp b/third_party/mojo/mojo_public.gyp index 08a341011d6133..36c567de02d898 100644 --- a/third_party/mojo/mojo_public.gyp +++ b/third_party/mojo/mojo_public.gyp @@ -210,76 +210,6 @@ '../..', ], }, - { - 'target_name': 'mojo_application_bindings_mojom', - 'type': 'none', - 'variables': { - 'mojom_files': [ - 'src/mojo/public/interfaces/application/application.mojom', - 'src/mojo/public/interfaces/application/service_provider.mojom', - 'src/mojo/public/interfaces/application/shell.mojom', - ], - }, - 'includes': [ 'mojom_bindings_generator_explicit.gypi' ], - }, - { - # GN version: //mojo/public/interfaces/application:application - 'target_name': 'mojo_application_bindings', - 'type': 'static_library', - 'dependencies': [ - 'mojo_application_bindings_mojom', - 'mojo_cpp_bindings', - ], - 'export_dependent_settings': [ - 'mojo_cpp_bindings', - ], - }, - { - # GN version: //mojo/public/cpp/application - 'target_name': 'mojo_application_base', - 'type': 'static_library', - 'sources': [ - 'src/mojo/public/cpp/application/application_connection.h', - 'src/mojo/public/cpp/application/application_delegate.h', - 'src/mojo/public/cpp/application/application_impl.h', - 'src/mojo/public/cpp/application/connect.h', - 'src/mojo/public/cpp/application/interface_factory.h', - 'src/mojo/public/cpp/application/interface_factory_impl.h', - 'src/mojo/public/cpp/application/lib/application_connection.cc', - 'src/mojo/public/cpp/application/lib/application_delegate.cc', - 'src/mojo/public/cpp/application/lib/application_impl.cc', - 'src/mojo/public/cpp/application/lib/interface_factory_connector.h', - 'src/mojo/public/cpp/application/lib/service_connector_registry.cc', - 'src/mojo/public/cpp/application/lib/service_connector_registry.h', - 'src/mojo/public/cpp/application/lib/service_provider_impl.cc', - 'src/mojo/public/cpp/application/lib/service_registry.cc', - 'src/mojo/public/cpp/application/lib/service_registry.h', - 'src/mojo/public/cpp/application/service_connector.h', - 'src/mojo/public/cpp/application/service_provider_impl.h', - ], - 'dependencies': [ - 'mojo_application_bindings', - ], - 'export_dependent_settings': [ - 'mojo_application_bindings', - ], - }, - { - # GN version: //mojo/public/cpp/application:standalone - 'target_name': 'mojo_application_standalone', - 'type': 'static_library', - 'sources': [ - 'src/mojo/public/cpp/application/lib/application_runner.cc', - 'src/mojo/public/cpp/application/application_runner.h', - ], - 'dependencies': [ - 'mojo_application_base', - 'mojo_environment_standalone', - ], - 'export_dependent_settings': [ - 'mojo_application_base', - ], - }, { 'target_name': 'mojo_interface_bindings_mojom', 'type': 'none', diff --git a/third_party/mojo/src/mojo/edk/test/BUILD.gn b/third_party/mojo/src/mojo/edk/test/BUILD.gn index 87357082cde3f1..6f460bc0d68aeb 100644 --- a/third_party/mojo/src/mojo/edk/test/BUILD.gn +++ b/third_party/mojo/src/mojo/edk/test/BUILD.gn @@ -84,7 +84,6 @@ mojo_edk_source_set("test_support_impl") { group("public_tests") { testonly = true deps = [ - ":mojo_public_application_unittests", ":mojo_public_bindings_unittests", ":mojo_public_environment_unittests", ":mojo_public_system_perftests", @@ -94,13 +93,6 @@ group("public_tests") { ] } -test("mojo_public_application_unittests") { - deps = [ - ":run_all_unittests", - "../../public/cpp/application/tests", - ] -} - test("mojo_public_bindings_unittests") { deps = [ ":run_all_unittests", diff --git a/third_party/mojo/src/mojo/public/BUILD.gn b/third_party/mojo/src/mojo/public/BUILD.gn index 576625fc293370..6216afa6435b9a 100644 --- a/third_party/mojo/src/mojo/public/BUILD.gn +++ b/third_party/mojo/src/mojo/public/BUILD.gn @@ -10,7 +10,6 @@ group("public") { deps = [ ":libmojo_sdk", ":sdk", - "cpp/application:standalone", "cpp/bindings", "cpp/environment:standalone", "cpp/utility", @@ -33,11 +32,9 @@ group("public") { group("sdk") { deps = [ "c/system", - "cpp/application:standalone", "cpp/bindings", "cpp/environment:standalone", "cpp/utility", - "interfaces/application", "interfaces/bindings", "js", ] diff --git a/third_party/mojo/src/mojo/public/cpp/application/tests/BUILD.gn b/third_party/mojo/src/mojo/public/cpp/application/tests/BUILD.gn deleted file mode 100644 index 7766a7d28a89b8..00000000000000 --- a/third_party/mojo/src/mojo/public/cpp/application/tests/BUILD.gn +++ /dev/null @@ -1,23 +0,0 @@ -# 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_sdk.gni") - -mojo_sdk_source_set("tests") { - testonly = true - - sources = [ - "service_registry_unittest.cc", - ] - - deps = [ - "//testing/gtest", - ] - - mojo_sdk_deps = [ - "mojo/public/cpp/application:standalone", - "mojo/public/cpp/environment:standalone", - "mojo/public/cpp/utility", - ] -} diff --git a/third_party/mojo/src/mojo/public/cpp/bindings/tests/BUILD.gn b/third_party/mojo/src/mojo/public/cpp/bindings/tests/BUILD.gn index c38d27ee220082..9ebd6f50b93680 100644 --- a/third_party/mojo/src/mojo/public/cpp/bindings/tests/BUILD.gn +++ b/third_party/mojo/src/mojo/public/cpp/bindings/tests/BUILD.gn @@ -56,53 +56,3 @@ mojo_sdk_source_set("mojo_public_bindings_test_utils") { mojo_sdk_deps = [ "mojo/public/c/system" ] } - -mojo_native_application("versioning_test_service") { - testonly = true - - deps = [ - ":versioning_test_service_source_set", - ] -} - -mojo_sdk_source_set("versioning_test_service_source_set") { - testonly = true - visibility = [ ":*" ] - - sources = [ - "versioning_test_service.cc", - ] - - mojo_sdk_deps = [ - "mojo/public/cpp/application:standalone", - "mojo/public/cpp/bindings", - "mojo/public/cpp/system", - "mojo/public/interfaces/bindings/tests:versioning_test_service_interfaces", - ] -} - -mojo_native_application("versioning_apptests") { - testonly = true - - deps = [ - ":versioning_apptest_source_set", - ] - data_deps = [ ":versioning_test_service" ] -} - -mojo_sdk_source_set("versioning_apptest_source_set") { - testonly = true - visibility = [ ":*" ] - - sources = [ - "versioning_apptest.cc", - ] - - mojo_sdk_deps = [ - "mojo/public/cpp/application:standalone", - "mojo/public/cpp/application:test_support_standalone", - "mojo/public/cpp/bindings", - "mojo/public/cpp/system", - "mojo/public/interfaces/bindings/tests:versioning_test_client_interfaces", - ] -} diff --git a/third_party/mojo/src/mojo/public/cpp/bindings/tests/versioning_apptest.cc b/third_party/mojo/src/mojo/public/cpp/bindings/tests/versioning_apptest.cc index c3629a264af0be..4e1cf697b42961 100644 --- a/third_party/mojo/src/mojo/public/cpp/bindings/tests/versioning_apptest.cc +++ b/third_party/mojo/src/mojo/public/cpp/bindings/tests/versioning_apptest.cc @@ -2,8 +2,8 @@ // Use of this source code is governed by a BSD-style license that can be // found in the LICENSE file. -#include "mojo/public/cpp/application/application_impl.h" -#include "mojo/public/cpp/application/application_test_base.h" +#include "mojo/application/public/cpp/application_impl.h" +#include "mojo/application/public/cpp/application_test_base.h" #include "mojo/public/cpp/system/macros.h" #include "mojo/public/interfaces/bindings/tests/versioning_test_client.mojom.h" diff --git a/third_party/mojo/src/mojo/public/cpp/bindings/tests/versioning_test_service.cc b/third_party/mojo/src/mojo/public/cpp/bindings/tests/versioning_test_service.cc index e5d63a4ab3cd39..97f76e9e0b2395 100644 --- a/third_party/mojo/src/mojo/public/cpp/bindings/tests/versioning_test_service.cc +++ b/third_party/mojo/src/mojo/public/cpp/bindings/tests/versioning_test_service.cc @@ -5,10 +5,10 @@ #include #include "mojo/public/c/system/main.h" -#include "mojo/public/cpp/application/application_connection.h" -#include "mojo/public/cpp/application/application_delegate.h" -#include "mojo/public/cpp/application/application_runner.h" -#include "mojo/public/cpp/application/interface_factory.h" +#include "mojo/application/public/cpp/application_connection.h" +#include "mojo/application/public/cpp/application_delegate.h" +#include "mojo/application/public/cpp/application_runner.h" +#include "mojo/application/public/cpp/interface_factory.h" #include "mojo/public/cpp/bindings/strong_binding.h" #include "mojo/public/cpp/system/macros.h" #include "mojo/public/interfaces/bindings/tests/versioning_test_service.mojom.h" diff --git a/third_party/mojo/src/mojo/public/java/BUILD.gn b/third_party/mojo/src/mojo/public/java/BUILD.gn index f797229f734fca..6e89f2b8413fb8 100644 --- a/third_party/mojo/src/mojo/public/java/BUILD.gn +++ b/third_party/mojo/src/mojo/public/java/BUILD.gn @@ -70,6 +70,6 @@ android_library("application") { deps = [ ":bindings", ":system", - "../interfaces/application:application_java", + "//mojo/application/public/interfaces:interfaces_java", ] } diff --git a/third_party/mojo_services/src/content_handler/public/interfaces/BUILD.gn b/third_party/mojo_services/src/content_handler/public/interfaces/BUILD.gn index c58507a1f7de5a..0e12f0ec4e2059 100644 --- a/third_party/mojo_services/src/content_handler/public/interfaces/BUILD.gn +++ b/third_party/mojo_services/src/content_handler/public/interfaces/BUILD.gn @@ -20,7 +20,6 @@ mojom("interfaces") { deps = [ "$mojo_network_service_root/network/public/interfaces", + "//mojo/application/public/interfaces", ] - - mojo_sdk_deps = [ "mojo/public/interfaces/application" ] } diff --git a/third_party/mojo_services/src/content_handler/public/interfaces/content_handler.mojom b/third_party/mojo_services/src/content_handler/public/interfaces/content_handler.mojom index 39ddfeaa86e8ad..4281bf6278e395 100644 --- a/third_party/mojo_services/src/content_handler/public/interfaces/content_handler.mojom +++ b/third_party/mojo_services/src/content_handler/public/interfaces/content_handler.mojom @@ -4,7 +4,7 @@ module mojo; -import "mojo/public/interfaces/application/application.mojom"; +import "mojo/application/public/interfaces/application.mojom"; import "network/public/interfaces/url_loader.mojom"; interface ContentHandler {