window-services: moves services/ui into services/ws

Here's the list of changes: git mv services/ui/common services/ws (update build files, rename services/ui/common:mus_common to common) git mv services/ui/public/cpp services/ws/public git mv services/ui/gpu_host services/ws git mv services/ui/ime services/ws git mv services/ui/test_ws services/ws git mv services/ui/input_devices services/ws/ git mv services/ui/ws2/* services/ws BUG=876924 TEST=covered by tests TBR=jamescook@chromium.org Cq-Include-Trybots: luci.chromium.try:android_optional_gpu_tests_rel;luci.chromium.try:linux_chromium_dbg_ng;luci.chromium.try:linux_layout_tests_slimming_paint_v2;master.tryserver.blink:linux_trusty_blink_rel Change-Id: Ia93dc557a45dc75bcf8a2b3bf80f2e393d4362ed Reviewed-on: https://chromium-review.googlesource.com/1188961 Commit-Queue: Scott Violet <sky@chromium.org> Reviewed-by: James Cook <jamescook@chromium.org> Reviewed-by: Daniel Cheng <dcheng@chromium.org> Reviewed-by: Scott Violet <sky@chromium.org> Cr-Commit-Position: refs/heads/master@{#586354}
Denger-Network · Aug 27, 2018 · 9f98425 · 9f98425
1 parent f3e132b
commit 9f98425
Show file tree

Hide file tree

Showing 358 changed files with 778 additions and 834 deletions.
diff --git a/WATCHLISTS b/WATCHLISTS
@@ -1160,7 +1160,7 @@
                   '|components/cryptauth/'
     },
     'mus': {
-      'filepath': 'services/ui/'\
+      'filepath': 'services/ws/'\
                   '|mojo/gpu/',
     },
     'nacl': {

diff --git a/ash/BUILD.gn b/ash/BUILD.gn
@@ -1323,11 +1323,11 @@ component("ash") {
     "//mash/public/mojom",
     "//mojo/public/cpp/system",
     "//services/service_manager/embedder",
-    "//services/ui/common:mus_common",
-    "//services/ui/public/cpp",
-    "//services/ui/public/cpp/input_devices",
-    "//services/ui/ws2:host",
-    "//services/ui/ws2:lib",
+    "//services/ws:host",
+    "//services/ws:lib",
+    "//services/ws/common",
+    "//services/ws/public/cpp",
+    "//services/ws/public/cpp/input_devices",
     "//services/ws/public/mojom",
     "//skia",
     "//ui/aura",
@@ -1391,8 +1391,8 @@ component("ash") {
     "//services/data_decoder/public/cpp",
     "//services/preferences/public/cpp",
     "//services/service_manager/public/cpp",
-    "//services/ui/gpu_host",
-    "//services/ui/public/cpp/input_devices:input_device_controller",
+    "//services/ws/gpu_host",
+    "//services/ws/public/cpp/input_devices:input_device_controller",
     "//services/ws/public/mojom/input_devices",
 
     # TODO(msw): Remove this; only ash_with_content should depend on webkit.
@@ -1593,9 +1593,9 @@ static_library("ash_shell_lib_with_content") {
     "//content/shell:content_shell_lib",
     "//device/bluetooth",
     "//net",
-    "//services/ui/ime/test_ime_driver:lib",
-    "//services/ui/ime/test_ime_driver/public/mojom",
-    "//services/ui/ws2:lib",
+    "//services/ws:lib",
+    "//services/ws/ime/test_ime_driver:lib",
+    "//services/ws/ime/test_ime_driver/public/mojom",
     "//skia",
     "//ui/aura",
     "//ui/base",
@@ -2031,8 +2031,8 @@ test("ash_unittests") {
     "//net:net",
     "//services/catalog:lib",
     "//services/service_manager/public/cpp:service_test_support",
-    "//services/ui/public/cpp/input_devices:test_support",
-    "//services/ui/ws2:test_support",
+    "//services/ws:test_support",
+    "//services/ws/public/cpp/input_devices:test_support",
     "//services/ws/public/mojom",
     "//skia",
     "//testing/gmock",
@@ -2324,9 +2324,9 @@ static_library("test_support_common") {
     "//components/user_manager:user_manager",
     "//components/viz/test:test_support",
     "//device/bluetooth",
-    "//services/ui/public/cpp",
-    "//services/ui/public/cpp/input_devices",
-    "//services/ui/ws2:test_support",
+    "//services/ws:test_support",
+    "//services/ws/public/cpp",
+    "//services/ws/public/cpp/input_devices",
     "//services/ws/public/mojom",
     "//skia",
     "//testing/gtest",
@@ -2405,7 +2405,7 @@ service("ash_service") {
 service_manifest("manifest") {
   name = "ash"
   source = "manifest.json"
-  packaged_services = [ "//services/ui:manifest" ]
+  packaged_services = [ "//services/ws:manifest" ]
 }
 
 # TODO: Load locale-specific strings.

diff --git a/ash/DEPS b/ash/DEPS
@@ -30,13 +30,8 @@ include_rules = [
   "+services/preferences/public",
   "+services/service_manager/embedder",
   "+services/service_manager/public",
-  "+services/ui/common",
-  "+services/ui/gpu_host/gpu_host.h",
-  "+services/ui/gpu_host/gpu_host_delegate.h",
-  "+services/ui/public",
-  "+services/ui/ws2",
   "+services/viz/public",
-  "+services/ws/public",
+  "+services/ws",
   "+skia/ext",
   "+third_party/cros_system_api",
   "+third_party/icu",
@@ -98,7 +93,7 @@ include_rules = [
   "-ui/events/devices",
 
   # Enums and supporting classes or observers that are safe (should be moved to
-  # services/ui/public/cpp). http://crbug.com/747544.
+  # services/ws/public/cpp). http://crbug.com/747544.
   "+ui/events/devices/device_hotplug_event_observer.h",
   "+ui/events/devices/input_device.h",
   "+ui/events/devices/input_device_event_observer.h",
@@ -137,8 +132,4 @@ specific_include_rules = {
   "window_service_delegate_impl.cc": [
     "+ash/host/ash_window_tree_host.h"
   ],
-  "window_manager_service.cc": [
-    "+chromeos/cryptohome",
-    "+services/ui/service.h"
-  ],
 }
diff --git a/ash/accelerators/accelerator_unittest.cc b/ash/accelerators/accelerator_unittest.cc
@@ -6,8 +6,8 @@
 #include "ash/accelerators/accelerator_controller.h"
 #include "ash/shell.h"
 #include "ash/test/ash_test_base.h"
-#include "services/ui/ws2/test_window_tree_client.h"
 #include "services/ws/public/mojom/window_tree_constants.mojom.h"
+#include "services/ws/test_window_tree_client.h"
 #include "ui/aura/window.h"
 #include "ui/base/accelerators/test_accelerator_target.h"
 #include "ui/events/event.h"

diff --git a/ash/accelerators/debug_commands.cc b/ash/accelerators/debug_commands.cc
@@ -20,7 +20,7 @@
 #include "base/metrics/user_metrics.h"
 #include "base/metrics/user_metrics_action.h"
 #include "base/strings/utf_string_conversions.h"
-#include "services/ui/ws2/window_service.h"
+#include "services/ws/window_service.h"
 #include "ui/compositor/debug_utils.h"
 #include "ui/compositor/layer.h"
 #include "ui/display/manager/display_manager.h"

diff --git a/ash/app_list/BUILD.gn b/ash/app_list/BUILD.gn
@@ -110,9 +110,9 @@ component("app_list") {
     "//components/keyed_service/core",
     "//components/sync",
     "//mojo/public/cpp/bindings",
-    "//services/ui/public/cpp",
-    "//services/ui/ws2/remote_view_host",
+    "//services/ws/public/cpp",
     "//services/ws/public/mojom",
+    "//services/ws/remote_view_host",
     "//skia",
     "//third_party/icu",
     "//ui/accessibility",

diff --git a/ash/app_list/DEPS b/ash/app_list/DEPS
@@ -3,7 +3,6 @@ include_rules = [
   "+components/keyed_service/core",
   "+components/sync",
   "+mojo/public/cpp",
-  "+services/ui/public",
   "+services/ws/public",
   "+skia",
   "+third_party/google_toolbox_for_mac/src",

diff --git a/ash/app_list/views/search_result_answer_card_view.cc b/ash/app_list/views/search_result_answer_card_view.cc
@@ -16,8 +16,8 @@
 #include "ash/public/cpp/app_list/app_list_constants.h"
 #include "base/bind.h"
 #include "base/feature_list.h"
-#include "services/ui/ws2/remote_view_host/server_remote_view_host.h"
 #include "services/ws/public/mojom/window_tree.mojom.h"
+#include "services/ws/remote_view_host/server_remote_view_host.h"
 #include "ui/accessibility/ax_node.h"
 #include "ui/accessibility/ax_node_data.h"
 #include "ui/aura/window.h"

diff --git a/ash/ash_service.cc b/ash/ash_service.cc
@@ -31,12 +31,12 @@
 #include "services/service_manager/embedder/embedded_service_info.h"
 #include "services/service_manager/public/cpp/connector.h"
 #include "services/service_manager/public/cpp/service_context.h"
-#include "services/ui/gpu_host/gpu_host.h"
-#include "services/ui/public/cpp/gpu/gpu.h"
-#include "services/ui/public/cpp/input_devices/input_device_controller.h"
-#include "services/ui/ws2/host_context_factory.h"
-#include "services/ui/ws2/window_service.h"
+#include "services/ws/gpu_host/gpu_host.h"
+#include "services/ws/host_context_factory.h"
+#include "services/ws/public/cpp/gpu/gpu.h"
+#include "services/ws/public/cpp/input_devices/input_device_controller.h"
 #include "services/ws/public/mojom/constants.mojom.h"
+#include "services/ws/window_service.h"
 #include "ui/aura/env.h"
 #include "ui/aura/window_tree_host.h"
 #include "ui/base/ui_base_features.h"

diff --git a/ash/ash_service.h b/ash/ash_service.h
@@ -11,7 +11,7 @@
 #include "services/service_manager/public/cpp/binder_registry.h"
 #include "services/service_manager/public/cpp/service.h"
 #include "services/service_manager/public/mojom/service_factory.mojom.h"
-#include "services/ui/gpu_host/gpu_host_delegate.h"
+#include "services/ws/gpu_host/gpu_host_delegate.h"
 #include "services/ws/public/mojom/gpu.mojom.h"
 
 namespace aura {

diff --git a/ash/ash_service_unittest.cc b/ash/ash_service_unittest.cc
@@ -13,7 +13,7 @@
 #include "base/macros.h"
 #include "base/run_loop.h"
 #include "services/service_manager/public/cpp/service_test.h"
-#include "services/ui/public/cpp/property_type_converters.h"
+#include "services/ws/public/cpp/property_type_converters.h"
 #include "services/ws/public/mojom/window_manager.mojom.h"
 #include "services/ws/public/mojom/window_tree.mojom.h"
 #include "services/ws/public/mojom/window_tree_constants.mojom.h"

diff --git a/ash/components/shortcut_viewer/BUILD.gn b/ash/components/shortcut_viewer/BUILD.gn
@@ -65,7 +65,7 @@ source_set("unit_tests") {
     ":lib",
     "//ash:test_support_without_content",
     "//base/test:test_support",
-    "//services/ui/public/cpp/input_devices:test_support",
+    "//services/ws/public/cpp/input_devices:test_support",
     "//testing/gtest",
     "//ui/events:test_support",
     "//ui/views",

diff --git a/ash/components/shortcut_viewer/DEPS b/ash/components/shortcut_viewer/DEPS
@@ -11,6 +11,6 @@ specific_include_rules = {
   "keyboard_shortcut_view_unittest\.cc": [
     "+ash/shell.h",
     "+ash/test/ash_test_base.h",
-    "+services/ui/public/cpp/input_devices",
+    "+services/ws/public/cpp/input_devices",
   ],
 }
diff --git a/ash/components/shortcut_viewer/views/keyboard_shortcut_view_unittest.cc b/ash/components/shortcut_viewer/views/keyboard_shortcut_view_unittest.cc
@@ -11,7 +11,7 @@
 #include "ash/components/shortcut_viewer/views/ksv_search_box_view.h"
 #include "ash/test/ash_test_base.h"
 #include "base/test/metrics/histogram_tester.h"
-#include "services/ui/public/cpp/input_devices/input_device_client_test_api.h"
+#include "services/ws/public/cpp/input_devices/input_device_client_test_api.h"
 #include "testing/gtest/include/gtest/gtest.h"
 #include "ui/aura/window.h"
 #include "ui/display/display.h"

diff --git a/ash/components/tap_visualizer/BUILD.gn b/ash/components/tap_visualizer/BUILD.gn
@@ -17,7 +17,7 @@ source_set("lib") {
     "//base",
     "//cc/paint",
     "//services/service_manager/public/cpp",
-    "//services/ui/public/cpp",
+    "//services/ws/public/cpp",
     "//services/ws/public/mojom",
     "//skia",
     "//ui/compositor",

diff --git a/ash/components/tap_visualizer/DEPS b/ash/components/tap_visualizer/DEPS
@@ -1,5 +1,4 @@
 include_rules = [
-  "+services/ui/public",
   "+services/ws/public",
   "+third_party/skia",
   "+ui/compositor",

diff --git a/ash/components/tap_visualizer/tap_visualizer_app.cc b/ash/components/tap_visualizer/tap_visualizer_app.cc
@@ -11,7 +11,7 @@
 #include "base/macros.h"
 #include "base/strings/utf_string_conversions.h"
 #include "services/service_manager/public/cpp/service_context.h"
-#include "services/ui/public/cpp/property_type_converters.h"
+#include "services/ws/public/cpp/property_type_converters.h"
 #include "services/ws/public/mojom/window_manager.mojom.h"
 #include "services/ws/public/mojom/window_tree_constants.mojom.h"
 #include "ui/aura/mus/property_converter.h"

diff --git a/ash/content/content_gpu_interface_provider.h b/ash/content/content_gpu_interface_provider.h
@@ -8,7 +8,7 @@
 #include "ash/content/ash_with_content_export.h"
 #include "base/macros.h"
 #include "base/memory/scoped_refptr.h"
-#include "services/ui/ws2/gpu_interface_provider.h"
+#include "services/ws/gpu_interface_provider.h"
 
 namespace ash {
 

diff --git a/ash/cursor_unittest.cc b/ash/cursor_unittest.cc
@@ -5,8 +5,8 @@
 #include "ash/test/ash_test_base.h"
 
 #include "ash/shell.h"
-#include "services/ui/ws2/test_window_tree_client.h"
-#include "services/ui/ws2/window_tree_test_helper.h"
+#include "services/ws/test_window_tree_client.h"
+#include "services/ws/window_tree_test_helper.h"
 #include "ui/aura/client/cursor_client.h"
 #include "ui/aura/window.h"
 #include "ui/aura/window_delegate.h"

diff --git a/ash/display/cros_display_config_unittest.cc b/ash/display/cros_display_config_unittest.cc
@@ -15,7 +15,7 @@
 #include "base/strings/string_number_conversions.h"
 #include "base/test/scoped_feature_list.h"
 #include "mojo/public/cpp/bindings/associated_binding.h"
-#include "services/ui/public/cpp/input_devices/input_device_client_test_api.h"
+#include "services/ws/public/cpp/input_devices/input_device_client_test_api.h"
 #include "ui/display/display_switches.h"
 #include "ui/display/manager/display_manager.h"
 #include "ui/display/manager/test/touch_transform_controller_test_api.h"

diff --git a/ash/display/touch_calibrator_controller_unittest.cc b/ash/display/touch_calibrator_controller_unittest.cc
@@ -11,7 +11,7 @@
 #include "ash/test/ash_test_base.h"
 #include "ash/touch/ash_touch_transform_controller.h"
 #include "base/stl_util.h"
-#include "services/ui/public/cpp/input_devices/input_device_client_test_api.h"
+#include "services/ws/public/cpp/input_devices/input_device_client_test_api.h"
 #include "ui/display/display.h"
 #include "ui/display/manager/display_manager.h"
 #include "ui/display/manager/test/touch_device_manager_test_api.h"

diff --git a/ash/display/window_tree_host_manager.cc b/ash/display/window_tree_host_manager.cc
@@ -31,7 +31,7 @@
 #include "base/strings/stringprintf.h"
 #include "base/strings/utf_string_conversions.h"
 #include "base/threading/thread_task_runner_handle.h"
-#include "services/ui/ws2/window_service.h"
+#include "services/ws/window_service.h"
 #include "ui/aura/client/capture_client.h"
 #include "ui/aura/client/focus_client.h"
 #include "ui/aura/client/screen_position_client.h"

diff --git a/ash/frame/detached_title_area_renderer.cc b/ash/frame/detached_title_area_renderer.cc
@@ -11,8 +11,8 @@
 #include "ash/shell.h"
 #include "ash/wm/property_util.h"
 #include "ash/wm/window_state.h"
-#include "services/ui/ws2/window_properties.h"
 #include "services/ws/public/mojom/window_tree_constants.mojom.h"
+#include "services/ws/window_properties.h"
 #include "ui/aura/client/aura_constants.h"
 #include "ui/aura/client/transient_window_client.h"
 #include "ui/aura/mus/property_converter.h"

diff --git a/ash/host/ash_window_tree_host_platform.cc b/ash/host/ash_window_tree_host_platform.cc
@@ -13,7 +13,7 @@
 #include "ash/window_factory.h"
 #include "base/feature_list.h"
 #include "base/trace_event/trace_event.h"
-#include "services/ui/public/cpp/input_devices/input_device_controller_client.h"
+#include "services/ws/public/cpp/input_devices/input_device_controller_client.h"
 #include "services/ws/public/mojom/window_manager.mojom.h"
 #include "ui/aura/mus/input_method_mus.h"
 #include "ui/aura/window.h"

diff --git a/ash/ime/ime_focus_handler.cc b/ash/ime/ime_focus_handler.cc
@@ -5,7 +5,7 @@
 #include "ash/ime/ime_focus_handler.h"
 
 #include "base/logging.h"
-#include "services/ui/ws2/window_service.h"
+#include "services/ws/window_service.h"
 #include "ui/aura/client/focus_client.h"
 #include "ui/base/ime/input_method.h"
 

diff --git a/ash/ime/ime_mode_indicator_view.cc b/ash/ime/ime_mode_indicator_view.cc
@@ -9,7 +9,7 @@
 #include "ash/wm/window_util.h"
 #include "base/logging.h"
 #include "base/macros.h"
-#include "services/ui/public/cpp/property_type_converters.h"
+#include "services/ws/public/cpp/property_type_converters.h"
 #include "services/ws/public/mojom/window_manager.mojom.h"
 #include "ui/display/display.h"
 #include "ui/display/screen.h"

diff --git a/ash/keyboard/virtual_keyboard_controller_unittest.cc b/ash/keyboard/virtual_keyboard_controller_unittest.cc
@@ -18,7 +18,7 @@
 #include "ash/wm/tablet_mode/scoped_disable_internal_mouse_and_keyboard.h"
 #include "ash/wm/tablet_mode/tablet_mode_controller.h"
 #include "base/command_line.h"
-#include "services/ui/public/cpp/input_devices/input_device_client_test_api.h"
+#include "services/ws/public/cpp/input_devices/input_device_client_test_api.h"
 #include "ui/display/test/display_manager_test_api.h"
 #include "ui/events/devices/input_device.h"
 #include "ui/events/devices/touchscreen_device.h"

diff --git a/ash/laser/laser_pointer_controller_unittest.cc b/ash/laser/laser_pointer_controller_unittest.cc
@@ -9,7 +9,7 @@
 #include "ash/public/cpp/config.h"
 #include "ash/shell.h"
 #include "ash/test/ash_test_base.h"
-#include "services/ui/ws2/server_window.h"
+#include "services/ws/server_window.h"
 #include "ui/events/test/event_generator.h"
 
 namespace ash {

diff --git a/ash/lock_screen_action/lock_screen_note_display_state_handler_unittest.cc b/ash/lock_screen_action/lock_screen_note_display_state_handler_unittest.cc
@@ -25,7 +25,7 @@
 #include "chromeos/dbus/dbus_thread_manager.h"
 #include "chromeos/dbus/fake_power_manager_client.h"
 #include "chromeos/dbus/power_manager/backlight.pb.h"
-#include "services/ui/public/cpp/input_devices/input_device_client_test_api.h"
+#include "services/ws/public/cpp/input_devices/input_device_client_test_api.h"
 #include "ui/events/devices/stylus_state.h"
 
 namespace ash {

diff --git a/ash/login/ui/login_test_base.cc b/ash/login/ui/login_test_base.cc
@@ -12,7 +12,7 @@
 #include "ash/public/interfaces/tray_action.mojom.h"
 #include "ash/shell.h"
 #include "base/strings/strcat.h"
-#include "services/ui/public/cpp/property_type_converters.h"
+#include "services/ws/public/cpp/property_type_converters.h"
 #include "services/ws/public/mojom/window_manager.mojom.h"
 #include "ui/views/widget/widget.h"
 #include "ui/views/widget/widget_delegate.h"

diff --git a/ash/shell.cc b/ash/shell.cc
@@ -176,8 +176,8 @@
 #include "services/preferences/public/cpp/pref_service_factory.h"
 #include "services/preferences/public/mojom/preferences.mojom.h"
 #include "services/service_manager/public/cpp/connector.h"
-#include "services/ui/ws2/gpu_interface_provider.h"
-#include "services/ui/ws2/window_service.h"
+#include "services/ws/gpu_interface_provider.h"
+#include "services/ws/window_service.h"
 #include "ui/aura/client/aura_constants.h"
 #include "ui/aura/env.h"
 #include "ui/aura/layout_manager.h"

diff --git a/ash/shell/BUILD.gn b/ash/shell/BUILD.gn
@@ -35,6 +35,6 @@ service_manifest("ash_content_packaged_services_manifest_overlay") {
     "//ash/components/quick_launch:manifest",
     "//ash/components/shortcut_viewer:manifest",
     "//ash/components/tap_visualizer:manifest",
-    "//services/ui/ime/test_ime_driver:manifest",
+    "//services/ws/ime/test_ime_driver:manifest",
   ]
 }
diff --git a/ash/shell/ash_shell_resources.grd b/ash/shell/ash_shell_resources.grd
@@ -14,7 +14,7 @@
       <include name="IDR_ASH_SHELL_QUICK_LAUNCH_MANIFEST" file="../../ash/components/quick_launch/manifest.json" type="BINDATA" use_base_dir="false" />
       <include name="IDR_ASH_SHELL_SHORTCUT_VIEWER_MANIFEST" file="../../ash/components/shortcut_viewer/manifest.json" type="BINDATA" use_base_dir="false" />
       <include name="IDR_ASH_SHELL_TAP_VISUALIZER_MANIFEST" file="../../ash/components/tap_visualizer/manifest.json" type="BINDATA" use_base_dir="false" />
-      <include name="IDR_ASH_SHELL_TEST_IME_DRIVER_MANIFEST" file="../../services/ui/ime/test_ime_driver/manifest.json" type="BINDATA" use_base_dir="false" />
+      <include name="IDR_ASH_SHELL_TEST_IME_DRIVER_MANIFEST" file="../../services/ws/ime/test_ime_driver/manifest.json" type="BINDATA" use_base_dir="false" />
     </includes>
   </release>
 </grit>