Move all event related devices from ui/events/ to ui/events/devices/

ui/events/platform/x11/x11_hotplug_event_handler.cc

 // Copyright 2014 The Chromium Authors. All rights reserved.
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
-#include "ui/events/x/hotplug_event_handler_x11.h"
+#include "ui/events/platform/x11/x11_hotplug_event_handler.h"
 
 #include <X11/extensions/XInput.h>
 #include <X11/extensions/XInput2.h>
 
 #include <algorithm>
 #include <cmath>
 #include <set>
 #include <string>
 #include <vector>
 
 #include "base/command_line.h"
 #include "base/logging.h"
 #include "base/process/launch.h"
 #include "base/strings/string_util.h"
 #include "base/sys_info.h"
-#include "ui/events/device_hotplug_event_observer.h"
-#include "ui/events/device_util_linux.h"
-#include "ui/events/input_device.h"
-#include "ui/events/keyboard_device.h"
-#include "ui/events/touchscreen_device.h"
+#include "ui/events/devices/device_hotplug_event_observer.h"
+#include "ui/events/devices/device_util_linux.h"
+#include "ui/events/devices/input_device.h"
+#include "ui/events/devices/keyboard_device.h"
+#include "ui/events/devices/touchscreen_device.h"
 #include "ui/gfx/x/x11_types.h"
 
 namespace ui {
 
 namespace {
 
 // The name of the xinput device corresponding to the AT internal keyboard.
 const char kATKeyboardName[] = "AT Translated Set 2 keyboard";
 
 // The prefix of xinput devices corresponding to CrOS EC internal keyboards.
@@ skipping 66 matching lines @@
   }
   base::FilePath dev_node_path(reinterpret_cast<char*>(data));
   XFree(data);
   XCloseDevice(dpy, dev);
 
   return ui::IsTouchscreenInternal(dev_node_path);
 }
 
 }  // namespace
 
-HotplugEventHandlerX11::HotplugEventHandlerX11(
+X11HotplugEventHandler::X11HotplugEventHandler(
     DeviceHotplugEventObserver* delegate)
     : delegate_(delegate) {
 }
 
-HotplugEventHandlerX11::~HotplugEventHandlerX11() {
+X11HotplugEventHandler::~X11HotplugEventHandler() {
 }
 
-void HotplugEventHandlerX11::OnHotplugEvent() {
+void X11HotplugEventHandler::OnHotplugEvent() {
   const XIDeviceList& device_list =
-      DeviceListCacheX::GetInstance()->GetXI2DeviceList(gfx::GetXDisplay());
+      DeviceListCacheX11::GetInstance()->GetXI2DeviceList(gfx::GetXDisplay());
   HandleTouchscreenDevices(device_list);
   HandleKeyboardDevices(device_list);
 }
 
-void HotplugEventHandlerX11::HandleKeyboardDevices(
+void X11HotplugEventHandler::HandleKeyboardDevices(
     const XIDeviceList& x11_devices) {
   std::vector<KeyboardDevice> devices;
 
   for (int i = 0; i < x11_devices.count; i++) {
     if (!x11_devices[i].enabled || x11_devices[i].use != XISlaveKeyboard)
       continue;  // Assume all keyboards are keyboard slaves
     std::string device_name(x11_devices[i].name);
     base::TrimWhitespaceASCII(device_name, base::TRIM_TRAILING, &device_name);
     if (IsTestKeyboard(device_name))
       continue;  // Skip test devices.
     InputDeviceType type;
     if (IsInternalKeyboard(device_name)) {
       type = InputDeviceType::INPUT_DEVICE_INTERNAL;
     } else if (IsKnownKeyboard(device_name)) {
       type = InputDeviceType::INPUT_DEVICE_EXTERNAL;
     } else {
       type = InputDeviceType::INPUT_DEVICE_UNKNOWN;
     }
     devices.push_back(
         KeyboardDevice(x11_devices[i].deviceid, type, device_name));
   }
   delegate_->OnKeyboardDevicesUpdated(devices);
 }
 
-void HotplugEventHandlerX11::HandleTouchscreenDevices(
+void X11HotplugEventHandler::HandleTouchscreenDevices(
     const XIDeviceList& x11_devices) {
   std::vector<TouchscreenDevice> devices;
   Display* display = gfx::GetXDisplay();
   Atom valuator_x = XInternAtom(display, "Abs MT Position X", False);
   Atom valuator_y = XInternAtom(display, "Abs MT Position Y", False);
   if (valuator_x == None || valuator_y == None)
     return;
 
   std::set<int> no_match_touchscreen;
   for (int i = 0; i < x11_devices.count; i++) {
@@ skipping 49 matching lines @@
           type,
           name,
           gfx::Size(max_x + 1, max_y + 1)));
     }
   }
 
   delegate_->OnTouchscreenDevicesUpdated(devices);
 }
 
 }  // namespace ui