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

ui/events/devices/x11/device_data_manager_x11.h

 // 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.
 
-#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,
 // which makes Bool unrecognized in XInput2.h.
 #ifndef Bool
 #define Bool int
 #endif
 
 #include <X11/extensions/XInput2.h>
 
 #include <bitset>
 #include <functional>
 #include <map>
 #include <set>
 #include <vector>
 
 #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"
 
 typedef union _XEvent XEvent;
 
 namespace ui {
 
 // CrOS touchpad metrics gesture types
 enum GestureMetricsType {
   kGestureMetricsTypeNoisyGround = 0,
   kGestureMetricsTypeUnknown,
 };
 
 // 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,
   // make sure to update the kCachedAtoms data structure in the source file
   // and the k*Type[Start/End] constants used by IsCMTDataType and
   // IsTouchDataType.
   enum DataType {
     // Define the valuators used the CrOS CMT driver. Used by mice and CrOS
     // touchpads.
     DT_CMT_SCROLL_X = 0,   // Scroll amount on the X (horizontal) direction.
@@ skipping 258 matching lines @@
   X11AtomCache atom_cache_;
 
   unsigned char button_map_[256];
   int button_map_count_;
 
   DISALLOW_COPY_AND_ASSIGN(DeviceDataManagerX11);
 };
 
 }  // namespace ui
 
-#endif  // UI_EVENTS_X_DEVICE_DATA_MANAGER_X11_H_
+#endif  // UI_EVENTS_DEVICES_X11_DEVICE_DATA_MANAGER_X11_H_