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

ui/events/platform/x11/x11_hotplug_event_handler.cc

Index: ui/events/platform/x11/x11_hotplug_event_handler.cc
diff --git a/ui/events/x/hotplug_event_handler_x11.cc b/ui/events/platform/x11/x11_hotplug_event_handler.cc
similarity index 91%
rename from ui/events/x/hotplug_event_handler_x11.cc
rename to ui/events/platform/x11/x11_hotplug_event_handler.cc
index 57d55bfaf34b52c01af7722410eb49e949dcd63e..3ce944efc3ebf3ea54e8701ea5d26a5bd7120c24 100644
--- a/ui/events/x/hotplug_event_handler_x11.cc
+++ b/ui/events/platform/x11/x11_hotplug_event_handler.cc
@@ -2,7 +2,7 @@
 // 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"

[sadrul, 2014/11/03 17:09:59]

I assume you renamed from _x11 to x11_ to match the rest of the files in
platform/x11/? (it's unfortunate that we have some files x11_ and some _x11 at
the moment ... sorry about that!)

[dnicoara, 2014/11/03 18:13:17]

Yes, just wanted to follow the same naming convention for all the files. If you
prefer the other form let me know and I'll just update it.

[sadrul, 2014/11/03 18:19:20]

What you have in this CL is fine. If you want to rename all the files in
devices/ and platform/, then I think we should go with <thing>_x11. But if you
do that, let's do that in a separate CL.

 
 #include <X11/extensions/XInput.h>
 #include <X11/extensions/XInput2.h>
@@ -18,11 +18,11 @@
 #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 {
@@ -109,22 +109,22 @@ bool IsTouchscreenInternal(XDisplay* dpy, int device_id) {
 
 }  // 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;
 
@@ -149,7 +149,7 @@ void HotplugEventHandlerX11::HandleKeyboardDevices(
   delegate_->OnKeyboardDevicesUpdated(devices);
 }
 
-void HotplugEventHandlerX11::HandleTouchscreenDevices(
+void X11HotplugEventHandler::HandleTouchscreenDevices(
     const XIDeviceList& x11_devices) {
   std::vector<TouchscreenDevice> devices;
   Display* display = gfx::GetXDisplay();