window-service: moves mojoms into ws directory
This does not change the namespace, only the directory. That will happen next.
BUG=876924
TEST=covered by tests
Cq-Include-Trybots: luci.chromium.try:android_optional_gpu_tests_rel;luci.chromium.try:linux_layout_tests_layout_ng
Change-Id: Iff71c6372b21ea13dfa9c35d44f06073a2ba3c77
Reviewed-on: https://chromium-review.googlesource.com/1186040
Reviewed-by: Tom Sepez <[email protected]>
Reviewed-by: Michael Wasserman <[email protected]>
Commit-Queue: Scott Violet <[email protected]>
Cr-Commit-Position: refs/heads/master@{#585626}diff --git a/components/arc/common/BUILD.gn b/components/arc/common/BUILD.gn
index 4ac40443..edaf0349 100644
--- a/components/arc/common/BUILD.gn
+++ b/components/arc/common/BUILD.gn
@@ -81,9 +81,8 @@
}
}
-# Media related mojo interfaces. There are used by
-# //services/ui/public/interfaces. We have this separate mojom target to avoid
-# pulling in unnecessary interfaces,
+# Media related mojo interfaces. There are used by //services/ws/public/mojom.
+# We have this separate mojom target to avoid pulling in unnecessary interfaces.
mojom("media") {
sources = [
"gfx.mojom",
diff --git a/components/exo/BUILD.gn b/components/exo/BUILD.gn
index 755fe0e..d2e6fbe 100644
--- a/components/exo/BUILD.gn
+++ b/components/exo/BUILD.gn
@@ -80,7 +80,7 @@
"//device/gamepad/public/cpp:shared_with_blink",
"//gpu",
"//gpu/command_buffer/client:gles2_interface",
- "//services/ui/public/interfaces",
+ "//services/ws/public/mojom",
"//skia",
"//ui/aura",
"//ui/base/ime",
diff --git a/components/exo/DEPS b/components/exo/DEPS
index 2fc1da6..0ef6c813 100644
--- a/components/exo/DEPS
+++ b/components/exo/DEPS
@@ -7,7 +7,7 @@
"+device/gamepad",
"+gpu",
"+mojo/public/cpp",
- "+services/ui/public/interfaces",
+ "+services/ws/public/mojom",
"+third_party/khronos",
"+third_party/skia",
"+ui",
diff --git a/components/exo/client_controlled_shell_surface.cc b/components/exo/client_controlled_shell_surface.cc
index e3d4678d..d8d42cd 100644
--- a/components/exo/client_controlled_shell_surface.cc
+++ b/components/exo/client_controlled_shell_surface.cc
@@ -34,7 +34,7 @@
#include "base/trace_event/trace_event_argument.h"
#include "components/exo/surface.h"
#include "components/exo/wm_helper.h"
-#include "services/ui/public/interfaces/window_tree_constants.mojom.h"
+#include "services/ws/public/mojom/window_tree_constants.mojom.h"
#include "ui/aura/client/aura_constants.h"
#include "ui/aura/window.h"
#include "ui/aura/window_event_dispatcher.h"
diff --git a/components/exo/shell_surface_base.cc b/components/exo/shell_surface_base.cc
index 7000261..6d020b6 100644
--- a/components/exo/shell_surface_base.cc
+++ b/components/exo/shell_surface_base.cc
@@ -28,7 +28,7 @@
#include "cc/trees/layer_tree_frame_sink.h"
#include "components/exo/surface.h"
#include "components/exo/wm_helper.h"
-#include "services/ui/public/interfaces/window_tree_constants.mojom.h"
+#include "services/ws/public/mojom/window_tree_constants.mojom.h"
#include "ui/accessibility/ax_node_data.h"
#include "ui/aura/client/aura_constants.h"
#include "ui/aura/client/cursor_client.h"
diff --git a/components/exo/surface.cc b/components/exo/surface.cc
index 7d462deb..d979ea07 100644
--- a/components/exo/surface.cc
+++ b/components/exo/surface.cc
@@ -25,7 +25,7 @@
#include "components/viz/common/resources/single_release_callback.h"
#include "components/viz/service/surfaces/surface.h"
#include "components/viz/service/surfaces/surface_manager.h"
-#include "services/ui/public/interfaces/window_tree_constants.mojom.h"
+#include "services/ws/public/mojom/window_tree_constants.mojom.h"
#include "third_party/khronos/GLES2/gl2.h"
#include "ui/aura/client/aura_constants.h"
#include "ui/aura/client/drag_drop_delegate.h"
diff --git a/components/exo/surface_tree_host.cc b/components/exo/surface_tree_host.cc
index bcbc1dcf..0495fb0d 100644
--- a/components/exo/surface_tree_host.cc
+++ b/components/exo/surface_tree_host.cc
@@ -13,7 +13,7 @@
#include "components/exo/wm_helper.h"
#include "components/viz/common/quads/compositor_frame.h"
#include "gpu/command_buffer/client/gles2_interface.h"
-#include "services/ui/public/interfaces/window_tree_constants.mojom.h"
+#include "services/ws/public/mojom/window_tree_constants.mojom.h"
#include "ui/aura/env.h"
#include "ui/aura/window.h"
#include "ui/aura/window_delegate.h"
diff --git a/components/services/pdf_compositor/BUILD.gn b/components/services/pdf_compositor/BUILD.gn
index 32b8993..0b2a6d5 100644
--- a/components/services/pdf_compositor/BUILD.gn
+++ b/components/services/pdf_compositor/BUILD.gn
@@ -24,7 +24,7 @@
"//content/public/common:service_names",
"//content/public/utility",
"//printing/common",
- "//services/ui/public/interfaces",
+ "//services/ws/public/mojom",
"//skia",
"//third_party/blink/public:blink_headers",
]
diff --git a/components/services/pdf_compositor/DEPS b/components/services/pdf_compositor/DEPS
index 952a2798..0c41bb8 100644
--- a/components/services/pdf_compositor/DEPS
+++ b/components/services/pdf_compositor/DEPS
@@ -9,7 +9,7 @@
"+printing/common",
"+services/service_manager/public/cpp",
"+services/service_manager/public/mojom",
- "+services/ui/public/interfaces/constants.mojom.h", # UI service name.
+ "+services/ws/public/mojom/constants.mojom.h", # UI service name.
"+skia",
"+third_party/skia",
"+third_party/blink/public/platform", # Test web sandbox support.
diff --git a/components/services/pdf_compositor/pdf_compositor_service.cc b/components/services/pdf_compositor/pdf_compositor_service.cc
index 3cd761e3..34bf7a2e 100644
--- a/components/services/pdf_compositor/pdf_compositor_service.cc
+++ b/components/services/pdf_compositor/pdf_compositor_service.cc
@@ -18,7 +18,7 @@
#include "mojo/public/cpp/bindings/strong_binding.h"
#include "services/service_manager/public/cpp/connector.h"
#include "services/service_manager/public/cpp/service_context.h"
-#include "services/ui/public/interfaces/constants.mojom.h"
+#include "services/ws/public/mojom/constants.mojom.h"
#include "ui/base/ui_base_features.h"
#if defined(OS_WIN)
diff --git a/components/viz/host/BUILD.gn b/components/viz/host/BUILD.gn
index 93fc819..2b0df116 100644
--- a/components/viz/host/BUILD.gn
+++ b/components/viz/host/BUILD.gn
@@ -53,9 +53,9 @@
public_deps = [
"//gpu/command_buffer/client",
"//gpu/ipc/host",
- "//services/ui/public/interfaces",
"//services/viz/privileged/interfaces/compositing",
"//services/viz/public/interfaces",
+ "//services/ws/public/mojom",
"//ui/gfx/geometry",
]
diff --git a/components/viz/host/DEPS b/components/viz/host/DEPS
index 1fe6066e..7450578 100644
--- a/components/viz/host/DEPS
+++ b/components/viz/host/DEPS
@@ -10,10 +10,10 @@
"+gpu/ipc/common",
"+gpu/ipc/host",
"+mojo/public/cpp",
- "+services/ui/public/interfaces",
"+services/viz/privileged/interfaces",
"+services/viz/public/interfaces",
"+services/viz/public/interfaces/hit_test",
+ "+services/ws/public/mojom",
"+skia",
"+third_party/skia",
"+ui/accelerated_widget_mac",
diff --git a/components/viz/host/gpu_client.h b/components/viz/host/gpu_client.h
index 7a388be..f968ad8 100644
--- a/components/viz/host/gpu_client.h
+++ b/components/viz/host/gpu_client.h
@@ -10,7 +10,7 @@
#include "components/viz/host/gpu_client_delegate.h"
#include "components/viz/host/viz_host_export.h"
#include "mojo/public/cpp/bindings/binding_set.h"
-#include "services/ui/public/interfaces/gpu.mojom.h"
+#include "services/ws/public/mojom/gpu.mojom.h"
namespace viz {
diff --git a/components/viz/service/BUILD.gn b/components/viz/service/BUILD.gn
index 33fc82ac..2034f07 100644
--- a/components/viz/service/BUILD.gn
+++ b/components/viz/service/BUILD.gn
@@ -358,8 +358,8 @@
"//gpu/ipc/service",
"//media",
"//media/capture:capture_lib",
- "//services/ui/public/interfaces",
"//services/viz/public/interfaces",
+ "//services/ws/public/mojom",
"//skia",
"//testing/gmock",
"//testing/gtest",
diff --git a/components/viz/service/gl/DEPS b/components/viz/service/gl/DEPS
index 1e459f8..b33ef28 100644
--- a/components/viz/service/gl/DEPS
+++ b/components/viz/service/gl/DEPS
@@ -19,6 +19,6 @@
specific_include_rules = {
"gpu_service_impl_unittest\.cc": [
- "+services/ui/public/interfaces",
+ "+services/ws/public/mojom",
]
}
diff --git a/components/viz/service/gl/gpu_service_impl_unittest.cc b/components/viz/service/gl/gpu_service_impl_unittest.cc
index ac88289..9f772c7 100644
--- a/components/viz/service/gl/gpu_service_impl_unittest.cc
+++ b/components/viz/service/gl/gpu_service_impl_unittest.cc
@@ -13,7 +13,7 @@
#include "base/single_thread_task_runner.h"
#include "gpu/config/gpu_info.h"
#include "gpu/ipc/service/gpu_watchdog_thread.h"
-#include "services/ui/public/interfaces/gpu.mojom.h"
+#include "services/ws/public/mojom/gpu.mojom.h"
#include "testing/gtest/include/gtest/gtest.h"
namespace viz {
