Move touchscreen device caching to DeviceDataManager

ui/events/touchscreen_device.h

Index: ui/events/touchscreen_device.h
diff --git a/ui/display/types/chromeos/touchscreen_device.h b/ui/events/touchscreen_device.h
similarity index 68%
rename from ui/display/types/chromeos/touchscreen_device.h
rename to ui/events/touchscreen_device.h
index 3a471fa16d012d28a931154567baba234facebff..669f3061f3374a7962d1d768012e26be1783f833 100644
--- a/ui/display/types/chromeos/touchscreen_device.h
+++ b/ui/events/touchscreen_device.h
@@ -2,16 +2,16 @@
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
-#ifndef UI_DISPLAY_TYPES_CHROMEOS_TOUCHSCREEN_DEVICE_H_
-#define UI_DISPLAY_TYPES_CHROMEOS_TOUCHSCREEN_DEVICE_H_
+#ifndef UI_EVENTS_TOUCHSCREEN_DEVICE_H_
+#define UI_EVENTS_TOUCHSCREEN_DEVICE_H_
 
-#include "ui/display/types/display_types_export.h"
+#include "ui/events/events_base_export.h"
 #include "ui/gfx/geometry/size.h"
 
 namespace ui {
 
 // Represents a Touchscreen device state.
-struct DISPLAY_TYPES_EXPORT TouchscreenDevice {
+struct EVENTS_BASE_EXPORT TouchscreenDevice {
   static const int kInvalidId;
 
   TouchscreenDevice(int id, const gfx::Size& size, bool is_internal);
@@ -28,4 +28,4 @@ struct DISPLAY_TYPES_EXPORT TouchscreenDevice {
 
 }  // namespace ui
 
-#endif  // UI_DISPLAY_TYPES_CHROMEOS_TOUCHSCREEN_DEVICE_H_
+#endif  // UI_EVENTS_TOUCHSCREEN_DEVICE_H_