chromium/src
0
Fork 0
Code Activity

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

Browse Source 
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}
This commit is contained in:
Scott Violet
2018-08-27 19:02:13 +00:00
committed by Commit Bot
parent f3e132bf69
commit 9f984257df
358 changed files with 777 additions and 833 deletions
WATCHLISTS
ash
BUILD.gnDEPS
accelerators
accelerator_unittest.ccdebug_commands.cc
app_list
BUILD.gnDEPS
views
search_result_answer_card_view.cc
ash_service.ccash_service.hash_service_unittest.cc
components
shortcut_viewer
BUILD.gnDEPS
views
keyboard_shortcut_view_unittest.cc
tap_visualizer
BUILD.gnDEPStap_visualizer_app.cc
content
content_gpu_interface_provider.h
cursor_unittest.cc
display
cros_display_config_unittest.cctouch_calibrator_controller_unittest.ccwindow_tree_host_manager.cc
frame
detached_title_area_renderer.cc
host
ash_window_tree_host_platform.cc
ime
ime_focus_handler.ccime_mode_indicator_view.cc
keyboard
virtual_keyboard_controller_unittest.cc
laser
laser_pointer_controller_unittest.cc
lock_screen_action
lock_screen_note_display_state_handler_unittest.cc
login
ui
login_test_base.cc
shell.cc
shell
BUILD.gnash_shell_resources.grd
content
client
DEPSshell_browser_main_parts.ccshell_content_browser_client.ccshell_main_delegate.cc
shell_delegate_mash.ccshell_init_params.ccshell_state.cc
system
ime
tray_ime_chromeos_unittest.cc
overview
overview_button_tray_unittest.cc
power
backlights_forced_off_setter_unittest.ccperipheral_battery_notifier_unittest.cc
test
ash_test_base.ccash_test_helper.cc
touch
touch_devices_controller.cc
wm
non_client_frame_controller.ccnon_client_frame_controller_unittest.ccproperty_util.cc
tablet_mode
scoped_disable_internal_mouse_and_keyboard_ozone.cctablet_mode_controller_unittest.cc
top_level_window_factory.cctop_level_window_factory_unittest.ccwindow_finder.ccwindow_util.cc
ws
ash_gpu_interface_provider.ccash_gpu_interface_provider.hwindow_service_delegate_impl.hwindow_service_delegate_impl_unittest.ccwindow_service_owner.cc
build
check_gn_headers_whitelist.txt
chrome
app
DEPS
browser
BUILD.gnDEPS
android
vr
BUILD.gnmailbox_to_surface_bridge.cc
browser_process_platform_part_chromeos.ccchrome_service.cc
chromeos
BUILD.gn
extensions
info_private_apitest.cc
lock_screen_apps
state_controller_unittest.cc
login
ui
login_display_host_webui.cc
system
input_device_settings_impl_ozone.cc
system_logs
touch_log_source.cc
metrics
chrome_browser_main_extra_parts_metrics_unittest.cc
ui
BUILD.gn
ash
ash_util.ccchrome_shell_delegate.ccsystem_tray_client.cc
views
DEPS
apps
chrome_native_app_window_views_aura_ash.cc
chrome_browser_main_extra_parts_views.cc
frame
browser_frame_mash.ccimmersive_mode_controller_ash.cc
screen_capture_notification_ui_views.ccstatus_bubble_views.cc
webui
chromeos
login
oobe_display_chooser_unittest.cc
settings
chromeos
device_keyboard_handler_unittest.cc
test
BUILD.gn
utility
DEPS
content
browser
BUILD.gn
compositor
DEPSbrowser_compositor_output_surface.ccgpu_browser_compositor_output_surface.ccgpu_output_surface_mac.ccgpu_process_transport_factory.ccgpu_process_transport_factory.hgpu_surfaceless_browser_compositor_output_surface.ccoffscreen_browser_compositor_output_surface.ccreflector_texture.ccviz_process_transport_factory.cc
gpu
gpu_ipc_browsertests.cc
renderer_host
DEPScompositor_impl_android.cccompositor_impl_android.hrender_widget_host_view_aura.cc
gpu
DEPS
renderer
BUILD.gn
media
android
stream_texture_factory.cc
gpu
gpu_video_accelerator_factories_impl.cc
media_factory.cc
stream
webmediaplayer_ms.ccwebmediaplayer_ms_compositor.cc
media_recorder
video_track_recorder.cc
mus
BUILD.gnmus_embedded_frame.ccmus_embedded_frame.hrenderer_window_tree_client.h
pepper
pepper_graphics_2d_host.ccvideo_decoder_shim.cc
render_frame_impl.ccrender_thread_impl.ccrenderer_blink_platform_impl.ccwebgraphicscontext3d_provider_impl.cc
test
BUILD.gnDEPSgpu_browsertest_helpers.cclayouttest_support.cc
docs/design
gpu_synchronization.md
mash
BUILD.gnDEPS
example
window_type_launcher
BUILD.gnwindow_type_launcher.cc
media
DEPS
video
BUILD.gnmock_gpu_video_accelerator_factories.h
services
BUILD.gn
content
public
cpp
DEPS
ui
BUILD.gnDEPS
public
cpp
gpu
DEPS
ws2
DEPSOWNERS
video_capture
BUILD.gnDEPSdevice_factory_provider_impl.cc
viz
README.md
ws
BUILD.gnDEPSOWNERSREADME.mdclient_change.ccclient_change.hclient_change_tracker.ccclient_change_tracker.hclient_root.ccclient_root.h
common
BUILD.gnDEPSOWNERSswitches.ccswitches.htask_runner_test_base.cctask_runner_test_base.htypes.hutil.h
drag_drop_delegate.ccdrag_drop_delegate.hdrag_drop_delegate_unittest.ccembedding.ccembedding.hembedding_unittest.ccevent_injector.ccevent_injector.hevent_test_utils.ccevent_test_utils.hfocus_handler.ccfocus_handler.hfocus_handler_unittest.cc
gpu_host
BUILD.gnDEPSarc_client.ccarc_client.hgpu_client.ccgpu_client.hgpu_host.ccgpu_host.hgpu_host_delegate.hgpu_host_unittest.cctest_gpu_host.cctest_gpu_host.h
gpu_interface_provider.hhost_context_factory.cchost_context_factory.hids.h
ime
BUILD.gnOWNERSime_driver_bridge.ccime_driver_bridge.hime_registrar_impl.ccime_registrar_impl.hime_unittest.cc
test_ime_driver
BUILD.gnOWNERSmain.ccmanifest.json
public
mojom
BUILD.gnOWNERSconstants.mojom
test_ime_application.cctest_ime_application.htest_ime_driver.cctest_ime_driver.h
test_manifest.json
injected_event_handler.ccinjected_event_handler.hinjected_event_handler_unittest.cc
input_devices
BUILD.gnOWNERSinput_device_server.ccinput_device_server.hinput_device_unittests.cc
manifest.jsonpointer_watcher.ccpointer_watcher.h
public
cpp
BUILD.gnDEPSOWNERS
gpu
BUILD.gnDEPSclient_gpu_memory_buffer_manager.ccclient_gpu_memory_buffer_manager.hcommand_buffer_metrics.cccommand_buffer_metrics.hcontext_provider_command_buffer.cccontext_provider_command_buffer.hgpu.ccgpu.h
input_devices
BUILD.gnOWNERSinput_device_client.ccinput_device_client.hinput_device_client_test_api.ccinput_device_client_test_api.hinput_device_controller.ccinput_device_controller.hinput_device_controller_client.ccinput_device_controller_client.h
property_type_converters.ccproperty_type_converters.hraster_thread_helper.ccraster_thread_helper.h
tests
BUILD.gnOWNERSgpu_unittest.ccproperty_type_converters_unittest.cc
remote_view_host
BUILD.gnserver_remote_view_host.ccserver_remote_view_host.hserver_remote_view_host_unittest.cc
remoting_event_injector.ccremoting_event_injector.hscreen_provider.ccscreen_provider.hscreen_provider_unittest.ccserver_window.ccserver_window.hserver_window_test_helper.ccserver_window_test_helper.hserver_window_unittest.cctest_change_tracker.cctest_change_tracker.htest_manifest.jsontest_screen_provider_observer.cctest_screen_provider_observer.htest_window_service_delegate.cctest_window_service_delegate.htest_window_tree_client.cctest_window_tree_client.h
test_ws
BUILD.gnOWNERSREADME.mdmanifest.jsontest_drag_drop_client.cctest_drag_drop_client.htest_gpu_interface_provider.cctest_gpu_interface_provider.htest_ws.cc
topmost_window_observer.cctopmost_window_observer.huser_activity_monitor.ccuser_activity_monitor.huser_activity_monitor_unittest.ccwindow_delegate_impl.ccwindow_delegate_impl.hwindow_delegate_impl_unittest.ccwindow_properties.ccwindow_properties.hwindow_server_service_test_base.ccwindow_server_service_test_base.hwindow_server_test_impl.ccwindow_server_test_impl.hwindow_service.ccwindow_service.hwindow_service_delegate.ccwindow_service_delegate.hwindow_service_observer.hwindow_service_observer_unittest.ccwindow_service_test_setup.ccwindow_service_test_setup.hwindow_service_unittest.ccwindow_tree.ccwindow_tree.hwindow_tree_binding.ccwindow_tree_binding.hwindow_tree_client_unittest.ccwindow_tree_factory.ccwindow_tree_factory.hwindow_tree_test_helper.ccwindow_tree_test_helper.hwindow_tree_unittest.cc
third_party/blink/renderer/platform
BUILD.gn
graphics
DEPSvideo_frame_submitter.cc
ui
aura
BUILD.gnDEPS
mus
DEPSembed_root.hmus_context_factory.ccmus_context_factory.hmus_types.hproperty_converter.ccproperty_converter_unittest.ccproperty_utils.ccuser_activity_forwarder_unittest.ccwindow_tree_client.ccwindow_tree_client_unittest.ccwindow_tree_host_mus_init_params.cc
test
DEPSaura_test_suite_setup.cc
mus
test_window_tree.h
base
ime
BUILD.gn
chromeos
DEPSime_keyboard_mus.cc
chromeos
BUILD.gnDEPS
ime
candidate_window_view.cc
compositor
DEPS
ozone
platform
drm
DEPS
views
mus
BUILD.gnDEPSmus_client.ccviews_mus_test_suite.cc
wm
BUILD.gn
core
DEPS
test
DEPSwm_test_helper.cc

2
WATCHLISTS

@ -1160,7 +1160,7 @@
'|components/cryptauth/'
},
'mus': {
'filepath': 'services/ui/'\
'filepath': 'services/ws/'\
'|mojo/gpu/',
},
'nacl': {

32
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.

13
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"
],
}

2
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"

2
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"

4
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",

1
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",

2
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"

10
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"

2
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 {

2
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"

2
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",

2
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",
],
}

2
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"

2
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",

1
ash/components/tap_visualizer/DEPS

@ -1,5 +1,4 @@
include_rules = [
"+services/ui/public",
"+services/ws/public",
"+third_party/skia",
"+ui/compositor",

2
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"

2
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 {

4
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"

2
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"

2
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"

2
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"

2
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"

2
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"

2
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"

2
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"

2
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"

2
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 {

2
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 {

2
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"

4
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"

2
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",
]
}

2
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>

2
ash/shell/content/client/DEPS

@ -6,5 +6,5 @@ include_rules = [
"+content/public",
"+content/shell",
"+storage/browser/quota",
"+services/ui/ime/test_ime_driver",
"+services/ws/ime/test_ime_driver",
]

2
ash/shell/content/client/shell_browser_main_parts.cc

@ -39,7 +39,7 @@
#include "device/bluetooth/dbus/bluez_dbus_manager.h"
#include "net/base/net_module.h"
#include "services/service_manager/public/cpp/connector.h"
#include "services/ui/ime/test_ime_driver/public/mojom/constants.mojom.h"
#include "services/ws/ime/test_ime_driver/public/mojom/constants.mojom.h"
#include "ui/aura/env.h"
#include "ui/aura/window.h"
#include "ui/aura/window_tree_host.h"

4
ash/shell/content/client/shell_content_browser_client.cc

@ -26,9 +26,9 @@
#include "content/public/common/service_manager_connection.h"
#include "content/public/common/service_names.mojom.h"
#include "content/public/utility/content_utility_client.h"
#include "services/ui/ime/test_ime_driver/public/mojom/constants.mojom.h"
#include "services/ui/ws2/window_service.h"
#include "services/ws/ime/test_ime_driver/public/mojom/constants.mojom.h"
#include "services/ws/public/mojom/constants.mojom.h"
#include "services/ws/window_service.h"
#include "storage/browser/quota/quota_settings.h"
#include "third_party/skia/include/core/SkBitmap.h"
#include "ui/base/resource/resource_bundle.h"

4
ash/shell/content/client/shell_main_delegate.cc

@ -17,8 +17,8 @@
#include "base/path_service.h"
#include "content/public/utility/content_utility_client.h"
#include "services/service_manager/public/cpp/service.h"
#include "services/ui/ime/test_ime_driver/public/mojom/constants.mojom.h"
#include "services/ui/ime/test_ime_driver/test_ime_application.h"
#include "services/ws/ime/test_ime_driver/public/mojom/constants.mojom.h"
#include "services/ws/ime/test_ime_driver/test_ime_application.h"
#include "ui/base/ime/input_method_initializer.h"
#include "ui/base/resource/resource_bundle.h"

2
ash/shell_delegate_mash.cc

@ -13,7 +13,7 @@
#include "base/strings/string16.h"
#include "base/strings/string_util.h"
#include "components/user_manager/user_info_impl.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 "ui/gfx/image/image.h"
#include "ui/keyboard/keyboard_ui.h"

2
ash/shell_init_params.cc

@ -6,7 +6,7 @@
#include "ash/shell_delegate.h"
#include "base/values.h"
#include "services/ui/ws2/gpu_interface_provider.h"
#include "services/ws/gpu_interface_provider.h"
namespace ash {

2
ash/shell_state.cc

@ -9,7 +9,7 @@
#include "ash/shell.h"
#include "ash/ws/window_service_owner.h"
#include "services/ui/ws2/window_service.h"
#include "services/ws/window_service.h"
#include "ui/display/display.h"
#include "ui/display/screen.h"

2
ash/system/ime/tray_ime_chromeos_unittest.cc

@ -14,7 +14,7 @@
#include "ash/test/ash_test_base.h"
#include "base/strings/string_number_conversions.h"
#include "base/strings/utf_string_conversions.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/input_device_manager.h"
#include "ui/keyboard/keyboard_util.h"

2
ash/system/overview/overview_button_tray_unittest.cc

@ -24,7 +24,7 @@
#include "base/command_line.h"
#include "base/test/metrics/user_action_tester.h"
#include "base/time/time.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/aura/client/aura_constants.h"
#include "ui/aura/window.h"
#include "ui/compositor/scoped_animation_duration_scale_mode.h"

2
ash/system/power/backlights_forced_off_setter_unittest.cc

@ -17,7 +17,7 @@
#include "base/scoped_observer.h"
#include "chromeos/dbus/dbus_thread_manager.h"
#include "chromeos/dbus/fake_power_manager_client.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/manager/display_manager.h"
#include "ui/display/manager/test/touch_transform_controller_test_api.h"
#include "ui/display/manager/touch_transform_setter.h"

2
ash/system/power/peripheral_battery_notifier_unittest.cc

@ -11,7 +11,7 @@
#include "ash/test/ash_test_base.h"
#include "base/macros.h"
#include "base/test/simple_test_tick_clock.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/touchscreen_device.h"
#include "ui/message_center/message_center.h"
#include "ui/message_center/public/cpp/notification.h"

10
ash/test/ash_test_base.cc

@ -37,13 +37,13 @@
#include "components/account_id/account_id.h"
#include "components/user_manager/user_names.h"
#include "mojo/public/cpp/bindings/map.h"
#include "services/ui/public/cpp/property_type_converters.h"
#include "services/ui/ws2/test_window_tree_client.h"
#include "services/ui/ws2/window_service.h"
#include "services/ui/ws2/window_tree.h"
#include "services/ui/ws2/window_tree_test_helper.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 "services/ws/test_window_tree_client.h"
#include "services/ws/window_service.h"
#include "services/ws/window_tree.h"
#include "services/ws/window_tree_test_helper.h"
#include "ui/aura/client/aura_constants.h"
#include "ui/aura/client/screen_position_client.h"
#include "ui/aura/client/window_parenting_client.h"

2
ash/test/ash_test_helper.cc

@ -39,7 +39,7 @@
#include "services/service_manager/public/cpp/connector.h"
#include "services/service_manager/public/cpp/identity.h"
#include "services/service_manager/public/cpp/service.h"
#include "services/ui/ws2/window_service.h"
#include "services/ws/window_service.h"
#include "ui/aura/env.h"
#include "ui/aura/input_state_lookup.h"
#include "ui/aura/test/env_test_helper.h"

2
ash/touch/touch_devices_controller.cc

@ -16,7 +16,7 @@
#include "components/prefs/pref_change_registrar.h"
#include "components/prefs/pref_registry_simple.h"
#include "components/prefs/pref_service.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 "ui/wm/core/cursor_manager.h"
namespace ash {

4
ash/wm/non_client_frame_controller.cc

@ -24,9 +24,9 @@
#include "base/macros.h"
#include "base/strings/string16.h"
#include "base/strings/utf_string_conversions.h"
#include "services/ui/ws2/window_properties.h"
#include "services/ui/ws2/window_service.h"
#include "services/ws/public/mojom/window_manager.mojom.h"
#include "services/ws/window_properties.h"
#include "services/ws/window_service.h"
#include "ui/accessibility/ax_node_data.h"
#include "ui/aura/client/aura_constants.h"
#include "ui/aura/client/transient_window_client.h"

4
ash/wm/non_client_frame_controller_unittest.cc

@ -15,9 +15,9 @@
#include "cc/trees/layer_tree_settings.h"
#include "components/viz/common/quads/compositor_frame.h"
#include "components/viz/common/quads/solid_color_draw_quad.h"
#include "services/ui/ws2/test_change_tracker.h"
#include "services/ui/ws2/test_window_tree_client.h"
#include "services/ws/public/mojom/window_tree_constants.mojom.h"
#include "services/ws/test_change_tracker.h"
#include "services/ws/test_window_tree_client.h"
#include "ui/accessibility/ax_enums.mojom.h"
#include "ui/accessibility/ax_node_data.h"
#include "ui/aura/client/aura_constants.h"

2
ash/wm/property_util.cc

@ -6,7 +6,7 @@
#include "ash/public/cpp/window_style.h"
#include "ash/public/interfaces/window_style.mojom.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/aura/mus/property_converter.h"
#include "ui/aura/window.h"

2
ash/wm/tablet_mode/scoped_disable_internal_mouse_and_keyboard_ozone.cc

@ -7,7 +7,7 @@
#include "ash/shell.h"
#include "ash/shell_delegate.h"
#include "ash/touch/touch_devices_controller.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 "ui/events/keycodes/dom/dom_code.h"
namespace ash {

2
ash/wm/tablet_mode/tablet_mode_controller_unittest.cc

@ -22,7 +22,7 @@
#include "chromeos/accelerometer/accelerometer_types.h"
#include "chromeos/dbus/dbus_thread_manager.h"
#include "chromeos/dbus/fake_power_manager_client.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/manager/display_manager.h"
#include "ui/display/screen.h"
#include "ui/display/test/display_manager_test_api.h"

6
ash/wm/top_level_window_factory.cc

@ -16,11 +16,11 @@
#include "ash/wm/property_util.h"
#include "ash/wm/window_state.h"
#include "mojo/public/cpp/bindings/type_converter.h"
#include "services/ui/public/cpp/property_type_converters.h"
#include "services/ui/ws2/window_delegate_impl.h"
#include "services/ui/ws2/window_properties.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 "services/ws/window_delegate_impl.h"
#include "services/ws/window_properties.h"
#include "ui/aura/client/aura_constants.h"
#include "ui/aura/mus/property_converter.h"
#include "ui/aura/mus/property_utils.h"

4
ash/wm/top_level_window_factory_unittest.cc

@ -15,9 +15,9 @@
#include "ash/test/ash_test_helper.h"
#include "ash/wm/window_properties.h"
#include "mojo/public/cpp/bindings/map.h"
#include "services/ui/public/cpp/property_type_converters.h"
#include "services/ui/ws2/window_tree_test_helper.h"
#include "services/ws/public/cpp/property_type_converters.h"
#include "services/ws/public/mojom/window_manager.mojom.h"
#include "services/ws/window_tree_test_helper.h"
#include "ui/aura/mus/property_converter.h"
#include "ui/aura/window.h"
#include "ui/display/screen.h"

2
ash/wm/window_finder.cc

@ -6,7 +6,7 @@
#include "ash/public/cpp/shell_window_ids.h"
#include "ash/wm/root_window_finder.h"
#include "services/ui/ws2/window_service.h"
#include "services/ws/window_service.h"
#include "ui/aura/client/screen_position_client.h"
#include "ui/aura/window.h"

2
ash/wm/window_util.cc

@ -22,7 +22,7 @@
#include "ash/wm/window_state.h"
#include "ash/wm/wm_event.h"
#include "ash/ws/window_service_owner.h"
#include "services/ui/ws2/window_service.h"
#include "services/ws/window_service.h"
#include "ui/aura/client/aura_constants.h"
#include "ui/aura/client/capture_client.h"
#include "ui/aura/client/focus_client.h"

2
ash/ws/ash_gpu_interface_provider.cc

@ -8,7 +8,7 @@
#include "components/discardable_memory/service/discardable_shared_memory_manager.h"
#include "services/service_manager/public/cpp/bind_source_info.h"
#include "services/service_manager/public/cpp/binder_registry.h"
#include "services/ui/gpu_host/gpu_host.h"
#include "services/ws/gpu_host/gpu_host.h"
#include "ui/ozone/public/ozone_platform.h"
namespace ash {

2
ash/ws/ash_gpu_interface_provider.h

@ -6,7 +6,7 @@
#define ASH_WS_ASH_GPU_INTERFACE_PROVIDER_H_
#include "components/discardable_memory/public/interfaces/discardable_shared_memory_manager.mojom.h"
#include "services/ui/ws2/gpu_interface_provider.h"
#include "services/ws/gpu_interface_provider.h"
#include "services/ws/public/mojom/arc.mojom.h"
#include "services/ws/public/mojom/gpu.mojom.h"

2
ash/ws/window_service_delegate_impl.h

@ -7,7 +7,7 @@
#include <memory>
#include "services/ui/ws2/window_service_delegate.h"
#include "services/ws/window_service_delegate.h"
namespace ash {

4
ash/ws/window_service_delegate_impl_unittest.cc

@ -8,8 +8,8 @@
#include "base/run_loop.h"
#include "base/test/bind_test_util.h"
#include "base/threading/thread_task_runner_handle.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/drag_drop_client.h"
#include "ui/aura/client/drag_drop_delegate.h"
#include "ui/aura/window.h"

4
ash/ws/window_service_owner.cc

@ -10,8 +10,8 @@
#include "ash/ws/window_service_delegate_impl.h"
#include "base/lazy_instance.h"
#include "services/service_manager/public/cpp/service_context.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/base/ui_base_features.h"
#include "ui/display/display.h"
#include "ui/display/screen.h"

1
build/check_gn_headers_whitelist.txt

@ -233,7 +233,6 @@ remoting/protocol/video_feedback_stub.h
remoting/protocol/video_stream.h
sandbox/linux/system_headers/capability.h
services/service_manager/public/c/main.h
services/ui/ws/ids.h
skia/ext/convolver_mips_dspr2.h
skia/ext/skia_commit_hash.h
testing/gmock_mutant.h

1
chrome/app/DEPS

@ -34,7 +34,6 @@ include_rules = [
"+native_client/src/trusted/service_runtime/osx",
"+remoting/client/plugin",
"+sandbox",
"+services/ui/public",
"+services/ws/public",
"+third_party/breakpad/breakpad",
"+third_party/crashpad/crashpad",

6
chrome/browser/BUILD.gn

@ -3100,9 +3100,9 @@ jumbo_split_static_library("browser") {
"//chromeos/services/secure_channel/public/mojom",
"//components/services/font:lib",
"//components/services/font/public/interfaces",
"//services/ui/public/cpp/input_devices",
"//services/ui/public/cpp/input_devices:input_device_controller",
"//services/ui/ws2:lib",
"//services/ws:lib",
"//services/ws/public/cpp/input_devices",
"//services/ws/public/cpp/input_devices:input_device_controller",
"//services/ws/public/mojom",
"//ui/ozone",
]

8
chrome/browser/DEPS

@ -77,12 +77,10 @@ include_rules = [
"+services/resource_coordinator/public/cpp",
"+services/resource_coordinator/public/mojom",
"+services/shape_detection/public/mojom",
"+services/ui/common",
"+services/ui/public",
"+services/ui/service.h",
"+services/ws/public",
"+services/video_capture/public",
"+services/viz/privileged",
"+services/ws/common",
"+services/ws/public",
"+skia/ext",
"+third_party/boringssl/src/include",
"+third_party/crashpad",
@ -206,7 +204,7 @@ include_rules = [
# shouldn't be used by Chrome directly.
"-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",

2
chrome/browser/android/vr/BUILD.gn

@ -102,7 +102,7 @@ static_library("vr_android") {
"//device/vr/buildflags:buildflags",
"//services/device/public/mojom",
"//services/metrics/public/cpp:ukm_builders",
"//services/ui/public/cpp/gpu",
"//services/ws/public/cpp/gpu",
"//third_party/gvr-android-sdk:gvr_shim",
"//ui/android",
"//ui/base",

2
chrome/browser/android/vr/mailbox_to_surface_bridge.cc

@ -22,7 +22,7 @@
#include "gpu/ipc/client/gpu_channel_host.h"
#include "gpu/ipc/common/gpu_memory_buffer_impl_android_hardware_buffer.h"
#include "gpu/ipc/common/gpu_surface_tracker.h"
#include "services/ui/public/cpp/gpu/context_provider_command_buffer.h"
#include "services/ws/public/cpp/gpu/context_provider_command_buffer.h"
#include "ui/gl/android/surface_texture.h"
#include <android/native_window_jni.h>

4
chrome/browser/browser_process_platform_part_chromeos.cc

@ -44,8 +44,8 @@
#include "services/service_manager/public/cpp/interface_provider.h"
#include "services/service_manager/public/cpp/service.h"
#include "services/service_manager/runner/common/client_util.h"
#include "services/ui/public/cpp/input_devices/input_device_controller.h"
#include "services/ui/public/cpp/input_devices/input_device_controller_client.h"
#include "services/ws/public/cpp/input_devices/input_device_controller.h"
#include "services/ws/public/cpp/input_devices/input_device_controller_client.h"
#include "services/ws/public/mojom/constants.mojom.h"
#include "ui/base/ui_base_features.h"

2
chrome/browser/chrome_service.cc

@ -22,7 +22,7 @@
#if defined(OS_CHROMEOS)
#include "chrome/browser/chromeos/launchable.h"
#if defined(USE_OZONE)
#include "services/ui/public/cpp/input_devices/input_device_controller.h"
#include "services/ws/public/cpp/input_devices/input_device_controller.h"
#endif
#endif
#if BUILDFLAG(ENABLE_SPELLCHECK)

4
chrome/browser/chromeos/BUILD.gn

@ -197,8 +197,8 @@ source_set("chromeos") {
"//components/sync",
"//printing",
"//remoting/host/it2me:chrome_os_host",
"//services/ui/public/cpp",
"//services/ui/public/cpp/input_devices",
"//services/ws/public/cpp",
"//services/ws/public/cpp/input_devices",
"//skia",
"//storage/browser",
"//storage/common",

2
chrome/browser/chromeos/extensions/info_private_apitest.cc

@ -20,7 +20,7 @@
#include "chromeos/settings/cros_settings_names.h"
#include "components/arc/arc_util.h"
#include "components/prefs/pref_service.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/input_device.h"
#include "ui/events/devices/touchscreen_device.h"
#include "ui/events/test/event_generator.h"

2
chrome/browser/chromeos/lock_screen_apps/state_controller_unittest.cc

@ -55,7 +55,7 @@
#include "extensions/common/api/app_runtime.h"
#include "extensions/common/extension_builder.h"
#include "extensions/common/value_builder.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/events/devices/input_device_manager.h"

2
chrome/browser/chromeos/login/ui/login_display_host_webui.cc

@ -84,7 +84,7 @@
#include "content/public/browser/web_contents.h"
#include "content/public/browser/web_ui.h"
#include "media/audio/sounds/sounds_manager.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/aura/window.h"
#include "ui/base/ime/chromeos/extension_ime_util.h"

2
chrome/browser/chromeos/system/input_device_settings_impl_ozone.cc

@ -10,7 +10,7 @@
#include "chrome/browser/chromeos/system/fake_input_device_settings.h"
#include "chromeos/system/devicemode.h"
#include "content/public/browser/browser_thread.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"
namespace chromeos {
namespace system {

2
chrome/browser/chromeos/system_logs/touch_log_source.cc

@ -20,7 +20,7 @@
#include "chrome/browser/browser_process.h"
#include "chrome/browser/browser_process_platform_part_chromeos.h"
#include "content/public/browser/browser_thread.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 "ui/base/ui_base_features.h"
using content::BrowserThread;

2
chrome/browser/metrics/chrome_browser_main_extra_parts_metrics_unittest.cc

@ -16,7 +16,7 @@
#include "ui/gfx/geometry/size.h"
#if defined(USE_OZONE) || defined(USE_X11)
#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"
#endif
namespace {

6
chrome/browser/ui/BUILD.gn

@ -2181,7 +2181,7 @@ jumbo_split_static_library("ui") {
"//services/data_decoder/public/cpp",
"//services/device/public/cpp:device_features",
"//services/device/public/mojom",
"//services/ui/public/cpp",
"//services/ws/public/cpp",
"//services/ws/public/mojom",
"//ui/base/ime",
"//ui/chromeos",
@ -3041,7 +3041,7 @@ jumbo_split_static_library("ui") {
"//components/constrained_window",
"//components/payments/content",
"//components/payments/core",
"//services/ui/public/cpp/input_devices",
"//services/ws/public/cpp/input_devices",
]
allow_circular_includes_from += [ "//chrome/browser/ui/views" ]
@ -3390,7 +3390,7 @@ jumbo_split_static_library("ui") {
if (use_aura) {
deps += [
"//services/ui/public/cpp",
"//services/ws/public/cpp",
"//services/ws/public/mojom",
]
}

2
chrome/browser/ui/ash/ash_util.cc

@ -12,7 +12,7 @@
#include "base/macros.h"
#include "content/public/common/service_manager_connection.h"
#include "mojo/public/cpp/bindings/type_converter.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/aura/window_event_dispatcher.h"
#include "ui/base/ui_base_features.h"

2
chrome/browser/ui/ash/chrome_shell_delegate.cc

@ -32,7 +32,7 @@
#include "chrome/browser/ui/scoped_tabbed_browser_displayer.h"
#include "content/public/common/service_manager_connection.h"
#include "content/public/common/url_constants.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 "ui/aura/window.h"
#include "ui/base/ui_base_features.h"
#include "url/url_constants.h"

2
chrome/browser/ui/ash/system_tray_client.cc

@ -53,7 +53,7 @@
#include "extensions/browser/api/vpn_provider/vpn_service_factory.h"
#include "net/base/escape.h"
#include "services/service_manager/public/cpp/connector.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 "third_party/cros_system_api/dbus/shill/dbus-constants.h"
#include "ui/base/ui_base_features.h"

4
chrome/browser/ui/views/DEPS

@ -1,9 +1,9 @@
include_rules = [
"+chrome/browser/ui/views",
"+components/constrained_window",
"+mash/common",
"+services/ui/public/cpp",
"+components/user_manager",
"+mash/common",
"+services/ws/public/cpp",
"+third_party/libaddressinput",
]

2
chrome/browser/ui/views/apps/chrome_native_app_window_views_aura_ash.cc

@ -29,7 +29,7 @@
#include "chrome/browser/ui/ash/tablet_mode_client.h"
#include "chrome/browser/ui/exclusive_access/exclusive_access_manager.h"
#include "chrome/browser/ui/views/exclusive_access_bubble_views.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/aura/client/aura_constants.h"
#include "ui/aura/mus/property_converter.h"

2
chrome/browser/ui/views/chrome_browser_main_extra_parts_views.cc

@ -30,7 +30,7 @@
#include "content/public/common/service_manager_connection.h"
#include "services/service_manager/public/cpp/connector.h"
#include "services/service_manager/runner/common/client_util.h"
#include "services/ui/public/cpp/gpu/gpu.h" // nogncheck
#include "services/ws/public/cpp/gpu/gpu.h" // nogncheck
#include "services/ws/public/mojom/constants.mojom.h"
#include "ui/aura/env.h"
#include "ui/display/screen.h"

2
chrome/browser/ui/views/frame/browser_frame_mash.cc

@ -19,7 +19,7 @@
#include "chrome/browser/ui/views/frame/browser_non_client_frame_view_ash.h"
#include "chrome/browser/ui/views/frame/browser_view.h"
#include "chrome/common/extensions/extension_constants.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 "ui/aura/client/aura_constants.h"

2
chrome/browser/ui/views/frame/immersive_mode_controller_ash.cc

@ -17,7 +17,7 @@
#include "chrome/browser/ui/views/tabs/tab_strip.h"
#include "content/public/browser/notification_service.h"
#include "content/public/browser/web_contents.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/aura/client/aura_constants.h"
#include "ui/aura/mus/mus_types.h"

2
chrome/browser/ui/views/screen_capture_notification_ui_views.cc

@ -32,7 +32,7 @@
#if defined(OS_CHROMEOS)
#include "ash/shell.h" // mash-ok
#include "mojo/public/cpp/bindings/type_converter.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/base/ui_base_features.h"
#include "ui/display/display.h"

2
chrome/browser/ui/views/status_bubble_views.cc

@ -43,7 +43,7 @@
#if defined(OS_CHROMEOS)
#include "ash/shell.h" // mash-ok
#include "ash/wm/window_state.h" // mash-ok
#include "services/ui/public/cpp/property_type_converters.h" // nogncheck
#include "services/ws/public/cpp/property_type_converters.h" // nogncheck
#include "services/ws/public/mojom/window_manager.mojom.h" // nogncheck
#endif

2
chrome/browser/ui/webui/chromeos/login/oobe_display_chooser_unittest.cc

@ -13,7 +13,7 @@
#include "base/run_loop.h"
#include "base/strings/string_number_conversions.h"
#include "mojo/public/cpp/bindings/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 "testing/gtest/include/gtest/gtest.h"
#include "ui/display/display.h"
#include "ui/display/display_observer.h"

2
chrome/browser/ui/webui/settings/chromeos/device_keyboard_handler_unittest.cc

@ -12,7 +12,7 @@
#include "base/observer_list.h"
#include "chromeos/chromeos_switches.h"
#include "content/public/test/test_web_ui.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/events/devices/input_device.h"

4
chrome/test/BUILD.gn

@ -1843,7 +1843,7 @@ test("browser_tests") {
"//services/preferences/public/cpp",
"//services/preferences/public/mojom",
"//services/service_manager/public/cpp",
"//services/ui/public/cpp/input_devices:test_support",
"//services/ws/public/cpp/input_devices:test_support",
"//ui/keyboard:test_support",
"//ui/login:resources",
"//url",
@ -3434,7 +3434,7 @@ test("unit_tests") {
}
if (use_x11 || use_ozone) {
deps += [ "//services/ui/public/cpp/input_devices:test_support" ]
deps += [ "//services/ws/public/cpp/input_devices:test_support" ]
}
if (enable_background_contents) {

4
chrome/utility/DEPS

@ -43,8 +43,6 @@ include_rules = [
"+services/network/public",
"+services/network/url_request_context_builder_mojo.h",
"+services/proxy_resolver",
"+services/ui/public",
"+services/ui/service.h",
"+services/ws/public",
"+skia/ext",
"+third_party/libxml",
@ -62,8 +60,6 @@ specific_include_rules = {
"+ash/components/tap_visualizer/tap_visualizer_app.h",
"+ash/public/interfaces",
"+ash/window_manager_service.h",
"+services/ui/public",
"+services/ui/service.h",
"+services/ws/public",
],
}

4
content/browser/BUILD.gn

@ -156,13 +156,13 @@ jumbo_source_set("browser") {
"//services/shape_detection/public/mojom",
"//services/tracing:lib",
"//services/tracing/public/cpp",
"//services/ui/public/cpp/gpu",
"//services/video_capture:lib",
"//services/video_capture/public/cpp",
"//services/video_capture/public/mojom:constants",
"//services/video_capture/public/uma",
"//services/viz/privileged/interfaces",
"//services/viz/public/interfaces",
"//services/ws/public/cpp/gpu",
"//skia",
"//sql",
"//storage/browser",
@ -2337,7 +2337,7 @@ jumbo_source_set("browser") {
if (use_aura) {
deps += [
"//services/ui/public/cpp",
"//services/ws/public/cpp",
"//services/ws/public/mojom",
"//ui/aura",
"//ui/aura_extra",

2
content/browser/compositor/DEPS

@ -2,7 +2,7 @@ include_rules = [
"+components/viz/common",
"+components/viz/host",
"+components/viz/service",
"+services/ui/public/cpp",
"+services/ws/public/cpp",
"+ui/platform_window",
]

2
content/browser/compositor/browser_compositor_output_surface.cc

@ -14,7 +14,7 @@
#include "components/viz/service/display/output_surface_client.h"
#include "components/viz/service/display_embedder/compositor_overlay_candidate_validator.h"
#include "content/browser/compositor/reflector_impl.h"
#include "services/ui/public/cpp/gpu/context_provider_command_buffer.h"
#include "services/ws/public/cpp/gpu/context_provider_command_buffer.h"
namespace content {

2
content/browser/compositor/gpu_browser_compositor_output_surface.cc

@ -18,7 +18,7 @@
#include "gpu/command_buffer/common/swap_buffers_complete_params.h"
#include "gpu/command_buffer/common/swap_buffers_flags.h"
#include "gpu/ipc/client/command_buffer_proxy_impl.h"
#include "services/ui/public/cpp/gpu/context_provider_command_buffer.h"
#include "services/ws/public/cpp/gpu/context_provider_command_buffer.h"
#include "ui/gl/gl_utils.h"
namespace content {

2
content/browser/compositor/gpu_output_surface_mac.cc

@ -8,7 +8,7 @@
#include "components/viz/service/display/output_surface_frame.h"
#include "components/viz/service/display_embedder/compositor_overlay_candidate_validator.h"
#include "gpu/GLES2/gl2extchromium.h"
#include "services/ui/public/cpp/gpu/context_provider_command_buffer.h"
#include "services/ws/public/cpp/gpu/context_provider_command_buffer.h"
namespace content {

2
content/browser/compositor/gpu_process_transport_factory.cc

@ -62,7 +62,7 @@
#include "gpu/ipc/host/gpu_memory_buffer_support.h"
#include "gpu/vulkan/buildflags.h"
#include "services/service_manager/runner/common/client_util.h"
#include "services/ui/public/cpp/gpu/context_provider_command_buffer.h"
#include "services/ws/public/cpp/gpu/context_provider_command_buffer.h"
#include "third_party/khronos/GLES2/gl2.h"
#include "ui/base/ui_base_features.h"
#include "ui/base/ui_base_switches_util.h"

2
content/browser/compositor/gpu_process_transport_factory.h

@ -23,7 +23,7 @@
#include "content/browser/compositor/image_transport_factory.h"
#include "gpu/ipc/client/gpu_channel_host.h"
#include "gpu/vulkan/buildflags.h"
#include "services/ui/public/cpp/gpu/command_buffer_metrics.h"
#include "services/ws/public/cpp/gpu/command_buffer_metrics.h"
#include "ui/compositor/compositor.h"
namespace base {

2
content/browser/compositor/gpu_surfaceless_browser_compositor_output_surface.cc

@ -14,7 +14,7 @@
#include "gpu/GLES2/gl2extchromium.h"
#include "gpu/command_buffer/client/gles2_interface.h"
#include "gpu/command_buffer/common/swap_buffers_complete_params.h"
#include "services/ui/public/cpp/gpu/context_provider_command_buffer.h"
#include "services/ws/public/cpp/gpu/context_provider_command_buffer.h"
namespace content {

2
content/browser/compositor/offscreen_browser_compositor_output_surface.cc

@ -18,7 +18,7 @@
#include "content/public/browser/browser_thread.h"
#include "gpu/command_buffer/client/context_support.h"
#include "gpu/command_buffer/client/gles2_interface.h"
#include "services/ui/public/cpp/gpu/context_provider_command_buffer.h"
#include "services/ws/public/cpp/gpu/context_provider_command_buffer.h"
#include "third_party/khronos/GLES2/gl2.h"
#include "third_party/khronos/GLES2/gl2ext.h"

Some files were not shown because too many files have changed in this diff Show More