From 5417ebd934543441aede65081c556357968ef72c Mon Sep 17 00:00:00 2001
From: Scott Violet <sky@chromium.org>
Date: Sun, 23 Jul 2017 20:02:59 +0000
Subject: [PATCH] chromeos: tightens DEPS for ui/events/devices

Parts of ui/events/devices are specific to the process hosing ozone
(mus) and ash should not be using them directly. This patch adds deps
for DeviceDataManager or InputDeviceManager, but they are
temporary. Also removes some stale includes.

BUG=747415
TEST=none

Change-Id: If54455c113f1545e2a3f58b24b1a0646a051f454
Reviewed-on: https://chromium-review.googlesource.com/581391
Commit-Queue: Scott Violet <sky@chromium.org>
Reviewed-by: Michael Wasserman <msw@chromium.org>
Cr-Commit-Position: refs/heads/master@{#488891}
---
 ash/DEPS                               | 20 ++++++++++++++++++++
 ash/host/DEPS                          |  5 +++++
 ash/root_window_controller_unittest.cc |  2 --
 ash/system/status_area_widget.cc       |  1 -
 4 files changed, 25 insertions(+), 3 deletions(-)

diff --git a/ash/DEPS b/ash/DEPS
index 99b18ddf47c386..6835a833d302bf 100644
--- a/ash/DEPS
+++ b/ash/DEPS
@@ -50,6 +50,26 @@ include_rules = [
   # Ozone does not run in process in mus/mash.
   "-ui/events/ozone",
   "-ui/ozone",
+
+  # ui/events/devices is tied with ozone, which is controlled by mus, and
+  # shouldn't be used by ash.
+  "-ui/events/devices",
+
+  # Enums and supporting classes or observers that are safe (should be moved to
+  # services/ui/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",
+  "+ui/events/devices/stylus_state.h",
+  "+ui/events/devices/touchscreen_device.h",
+
+  # TODO: This is temporary, ash should not use these. http://crbug.com/747415.
+  "+ui/events/devices/device_data_manager.h",
+  "+ui/events/devices/input_device_manager.h",
+
+  # X11 support isn't used in production and will go away soon.
+  # http://crbug.com/671355.
+  "+ui/events/devices/x11",
 ]
 
 specific_include_rules = {
diff --git a/ash/host/DEPS b/ash/host/DEPS
index a9a805b8cb5192..9b281dfa2a480e 100644
--- a/ash/host/DEPS
+++ b/ash/host/DEPS
@@ -17,4 +17,9 @@ specific_include_rules = {
     # ozone.
     "+ui/events/ozone/chromeos/cursor_controller.h",
   ],
+  # X11 support isn't used and will be removed soon, so it can depend on
+  # whatever.
+  "ash_window_tree_host_x11.cc": [
+    "+ui/events/devices",
+  ],
 }
diff --git a/ash/root_window_controller_unittest.cc b/ash/root_window_controller_unittest.cc
index ce7e1d647e6d7e..1dcae0c0f5478f 100644
--- a/ash/root_window_controller_unittest.cc
+++ b/ash/root_window_controller_unittest.cc
@@ -31,8 +31,6 @@
 #include "ui/base/ime/text_input_client.h"
 #include "ui/display/manager/display_manager.h"
 #include "ui/display/test/display_manager_test_api.h"
-#include "ui/events/devices/device_data_manager.h"
-#include "ui/events/devices/touchscreen_device.h"
 #include "ui/events/test/event_generator.h"
 #include "ui/events/test/test_event_handler.h"
 #include "ui/keyboard/keyboard_controller.h"
diff --git a/ash/system/status_area_widget.cc b/ash/system/status_area_widget.cc
index 967cda6ba522f1..8113bf66fac164 100644
--- a/ash/system/status_area_widget.cc
+++ b/ash/system/status_area_widget.cc
@@ -22,7 +22,6 @@
 #include "ash/system/web_notification/web_notification_tray.h"
 #include "base/i18n/time_formatting.h"
 #include "ui/display/display.h"
-#include "ui/events/devices/input_device_manager.h"
 #include "ui/native_theme/native_theme_dark_aura.h"
 
 namespace ash {