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

athena/main/athena_launcher.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 "athena/main/public/athena_launcher.h"
 
 #include "athena/activity/public/activity_factory.h"
 #include "athena/activity/public/activity_manager.h"
 #include "athena/content/public/app_registry.h"
 #include "athena/content/public/content_activity_factory_creator.h"
@@ skipping 19 matching lines @@
 #include "content/public/common/content_switches.h"
 #include "ui/app_list/app_list_switches.h"
 #include "ui/aura/window_property.h"
 #include "ui/aura/window_tree_host.h"
 #include "ui/keyboard/keyboard_controller.h"
 #include "ui/keyboard/keyboard_controller_observer.h"
 #include "ui/native_theme/native_theme_switches.h"
 #include "ui/wm/core/visibility_controller.h"
 
 #if defined(USE_X11)
-#include "ui/events/x/touch_factory_x11.h"
+#include "ui/events/devices/x11/touch_factory_x11.h"
 #endif
 
 namespace athena {
 struct AthenaEnvState;
 }
 
 DECLARE_WINDOW_PROPERTY_TYPE(athena::AthenaEnvState*);
 
 namespace athena {
 
@@ skipping 123 matching lines @@
   athena::SystemUI::Shutdown();
   athena::WindowManager::Shutdown();
   athena::ScreenManager::Shutdown();
   athena::InputManager::Shutdown();
   athena::AthenaEnv::Shutdown();
 
   ShutdownAthenaViewsDelegate();
 }
 
 }  // namespace athena