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

ash/host/ash_window_tree_host_x11.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 "ash/host/ash_window_tree_host_x11.h"
 
 #include <X11/extensions/Xfixes.h>
 #include <X11/extensions/XInput2.h>
 #include <X11/Xatom.h>
 #include <X11/Xlib.h>
 
 #include <string>
 #include <vector>
 
 #include "ash/host/ash_window_tree_host_init_params.h"
 #include "ash/host/root_window_transformer.h"
 #include "base/basictypes.h"
 #include "base/sys_info.h"
 #include "ui/aura/client/screen_position_client.h"
 #include "ui/aura/env.h"
 #include "ui/aura/window.h"
 #include "ui/aura/window_event_dispatcher.h"
 #include "ui/base/x/x11_util.h"
-#include "ui/events/device_data_manager.h"
+#include "ui/events/devices/device_data_manager.h"
+#include "ui/events/devices/x11/device_list_cache_x11.h"
+#include "ui/events/devices/x11/touch_factory_x11.h"
 #include "ui/events/event.h"
 #include "ui/events/event_utils.h"
 #include "ui/events/platform/platform_event_source.h"
-#include "ui/events/x/device_list_cache_x.h"
-#include "ui/events/x/touch_factory_x11.h"
 #include "ui/gfx/rect.h"
 #include "ui/gfx/screen.h"
 
 namespace ash {
 
 AshWindowTreeHostX11::AshWindowTreeHostX11(const gfx::Rect& initial_bounds)
     : WindowTreeHostX11(initial_bounds),
       transformer_helper_(this),
       display_ids_(std::make_pair(gfx::Display::kInvalidDisplayID,
                                   gfx::Display::kInvalidDisplayID)) {
@@ skipping 211 matching lines @@
 }
 
 #if defined(OS_CHROMEOS)
 void AshWindowTreeHostX11::SetCrOSTapPaused(bool state) {
   if (!ui::IsXInput2Available())
     return;
   // Temporarily pause tap-to-click when the cursor is hidden.
   Atom prop = atom_cache()->GetAtom("Tap Paused");
   unsigned char value = state;
   XIDeviceList dev_list =
-      ui::DeviceListCacheX::GetInstance()->GetXI2DeviceList(xdisplay());
+      ui::DeviceListCacheX11::GetInstance()->GetXI2DeviceList(xdisplay());
 
   // Only slave pointer devices could possibly have tap-paused property.
   for (int i = 0; i < dev_list.count; i++) {
     if (dev_list[i].use == XISlavePointer) {
       Atom old_type;
       int old_format;
       unsigned long old_nvalues, bytes;
       unsigned char* data;
       int result = XIGetProperty(xdisplay(),
                                  dev_list[i].deviceid,
@@ skipping 22 matching lines @@
   }
 }
 #endif
 
 AshWindowTreeHost* AshWindowTreeHost::Create(
     const AshWindowTreeHostInitParams& init_params) {
   return new AshWindowTreeHostX11(init_params.initial_bounds);
 }
 
 }  // namespace ash