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

ui/events/devices/x11/device_data_manager_x11.h

Index: ui/events/devices/x11/device_data_manager_x11.h
diff --git a/ui/events/x/device_data_manager_x11.h b/ui/events/devices/x11/device_data_manager_x11.h
similarity index 97%
rename from ui/events/x/device_data_manager_x11.h
rename to ui/events/devices/x11/device_data_manager_x11.h
index 02da999a1cdffcc3e89bf43bade9d82183e6ca3c..ec580cbd4ddc77fbc51c22771f63e3e9a7fb175f 100644
--- a/ui/events/x/device_data_manager_x11.h
+++ b/ui/events/devices/x11/device_data_manager_x11.h
@@ -2,8 +2,8 @@
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
-#ifndef UI_EVENTS_X_DEVICE_DATA_MANAGER_X11_H_
-#define UI_EVENTS_X_DEVICE_DATA_MANAGER_X11_H_
+#ifndef UI_EVENTS_DEVICES_X11_DEVICE_DATA_MANAGER_X11_H_
+#define UI_EVENTS_DEVICES_X11_DEVICE_DATA_MANAGER_X11_H_
 
 // Generically-named #defines from Xlib is conflicting with symbols in GTest.
 // So many tests .cc file #undef Bool before including device_data_manager.h,
@@ -23,9 +23,9 @@
 #include "base/basictypes.h"
 #include "base/event_types.h"
 #include "base/memory/scoped_ptr.h"
-#include "ui/events/device_data_manager.h"
+#include "ui/events/devices/device_data_manager.h"
+#include "ui/events/devices/events_devices_export.h"
 #include "ui/events/event_constants.h"
-#include "ui/events/events_base_export.h"
 #include "ui/events/keycodes/keyboard_codes.h"
 #include "ui/gfx/geometry/rect.h"
 #include "ui/gfx/x/x11_atom_cache.h"
@@ -42,7 +42,7 @@ enum GestureMetricsType {
 
 // A class that extracts and tracks the input events data. It currently handles
 // mouse, touchpad and touchscreen devices.
-class EVENTS_BASE_EXPORT DeviceDataManagerX11 : public DeviceDataManager {
+class EVENTS_DEVICES_EXPORT DeviceDataManagerX11 : public DeviceDataManager {
  public:
   // Enumerate additional data that one might be interested on an input event,
   // which are usually wrapped in X valuators. If you modify any of this,
@@ -321,4 +321,4 @@ class EVENTS_BASE_EXPORT DeviceDataManagerX11 : public DeviceDataManager {
 
 }  // namespace ui
 
-#endif  // UI_EVENTS_X_DEVICE_DATA_MANAGER_X11_H_
+#endif  // UI_EVENTS_DEVICES_X11_DEVICE_DATA_MANAGER_X11_H_