summaryrefslogtreecommitdiffstats
path: root/ui/aura
diff options
context:
space:
mode:
Diffstat (limited to 'ui/aura')
-rw-r--r--ui/aura/demo/demo_main.cc2
-rw-r--r--ui/aura/device_list_updater_aurax11.cc2
-rw-r--r--ui/aura/env.h4
-rw-r--r--ui/aura/gestures/gesture_recognizer_unittest.cc4
-rw-r--r--ui/aura/remote_root_window_host_win.cc2
-rw-r--r--ui/aura/remote_root_window_host_win.h4
-rw-r--r--ui/aura/root_window.cc2
-rw-r--r--ui/aura/root_window.h4
-rw-r--r--ui/aura/root_window_host_win.cc2
-rw-r--r--ui/aura/root_window_host_x11.cc4
-rw-r--r--ui/aura/root_window_unittest.cc6
-rw-r--r--ui/aura/test/event_generator.cc4
-rw-r--r--ui/aura/test/event_generator.h2
-rw-r--r--ui/aura/test/test_event_handler.cc2
-rw-r--r--ui/aura/test/test_event_handler.h2
-rw-r--r--ui/aura/test/test_window_delegate.cc2
-rw-r--r--ui/aura/window.h4
-rw-r--r--ui/aura/window_delegate.h4
-rw-r--r--ui/aura/window_unittest.cc4
19 files changed, 30 insertions, 30 deletions
diff --git a/ui/aura/demo/demo_main.cc b/ui/aura/demo/demo_main.cc
index fb23684..dbf1c80 100644
--- a/ui/aura/demo/demo_main.cc
+++ b/ui/aura/demo/demo_main.cc
@@ -16,11 +16,11 @@
#include "ui/aura/test/test_screen.h"
#include "ui/aura/window.h"
#include "ui/aura/window_delegate.h"
-#include "ui/base/events/event.h"
#include "ui/base/hit_test.h"
#include "ui/base/resource/resource_bundle.h"
#include "ui/base/ui_base_paths.h"
#include "ui/compositor/compositor.h"
+#include "ui/events/event.h"
#include "ui/gfx/canvas.h"
#include "ui/gfx/rect.h"
diff --git a/ui/aura/device_list_updater_aurax11.cc b/ui/aura/device_list_updater_aurax11.cc
index 0671dfe..8240cb4 100644
--- a/ui/aura/device_list_updater_aurax11.cc
+++ b/ui/aura/device_list_updater_aurax11.cc
@@ -6,7 +6,7 @@
#include <X11/extensions/XInput2.h>
-#include "ui/base/events/event_utils.h"
+#include "ui/events/event_utils.h"
namespace aura {
diff --git a/ui/aura/env.h b/ui/aura/env.h
index 7228da7..c52b892 100644
--- a/ui/aura/env.h
+++ b/ui/aura/env.h
@@ -9,8 +9,8 @@
#include "base/message_loop/message_loop.h"
#include "base/observer_list.h"
#include "ui/aura/aura_export.h"
-#include "ui/base/events/event_handler.h"
-#include "ui/base/events/event_target.h"
+#include "ui/events/event_handler.h"
+#include "ui/events/event_target.h"
#include "ui/gfx/point.h"
#if defined(USE_X11)
diff --git a/ui/aura/gestures/gesture_recognizer_unittest.cc b/ui/aura/gestures/gesture_recognizer_unittest.cc
index b68a4b6..f17a320 100644
--- a/ui/aura/gestures/gesture_recognizer_unittest.cc
+++ b/ui/aura/gestures/gesture_recognizer_unittest.cc
@@ -14,14 +14,14 @@
#include "ui/aura/test/event_generator.h"
#include "ui/aura/test/test_window_delegate.h"
#include "ui/aura/test/test_windows.h"
-#include "ui/base/events/event.h"
-#include "ui/base/events/event_utils.h"
#include "ui/base/gestures/gesture_configuration.h"
#include "ui/base/gestures/gesture_recognizer_impl.h"
#include "ui/base/gestures/gesture_sequence.h"
#include "ui/base/gestures/gesture_types.h"
#include "ui/base/hit_test.h"
#include "ui/base/ui_base_switches.h"
+#include "ui/events/event.h"
+#include "ui/events/event_utils.h"
#include "ui/gfx/point.h"
#include "ui/gfx/rect.h"
diff --git a/ui/aura/remote_root_window_host_win.cc b/ui/aura/remote_root_window_host_win.cc
index 871df52..7c8985d 100644
--- a/ui/aura/remote_root_window_host_win.cc
+++ b/ui/aura/remote_root_window_host_win.cc
@@ -15,7 +15,7 @@
#include "ui/aura/client/cursor_client.h"
#include "ui/aura/root_window.h"
#include "ui/base/cursor/cursor_loader_win.h"
-#include "ui/base/events/event_utils.h"
+#include "ui/events/event_utils.h"
#include "ui/events/keycodes/keyboard_code_conversion_win.h"
#include "ui/base/view_prop.h"
#include "ui/gfx/insets.h"
diff --git a/ui/aura/remote_root_window_host_win.h b/ui/aura/remote_root_window_host_win.h
index 3c9f9cf..5ad54a1 100644
--- a/ui/aura/remote_root_window_host_win.h
+++ b/ui/aura/remote_root_window_host_win.h
@@ -11,8 +11,8 @@
#include "base/compiler_specific.h"
#include "base/strings/string16.h"
#include "ui/aura/root_window_host.h"
-#include "ui/base/events/event.h"
-#include "ui/base/events/event_constants.h"
+#include "ui/events/event.h"
+#include "ui/events/event_constants.h"
#include "ui/gfx/native_widget_types.h"
namespace base {
diff --git a/ui/aura/root_window.cc b/ui/aura/root_window.cc
index 6b17d93..6e6fad4 100644
--- a/ui/aura/root_window.cc
+++ b/ui/aura/root_window.cc
@@ -24,7 +24,6 @@
#include "ui/aura/window.h"
#include "ui/aura/window_delegate.h"
#include "ui/aura/window_tracker.h"
-#include "ui/base/events/event.h"
#include "ui/base/gestures/gesture_recognizer.h"
#include "ui/base/gestures/gesture_types.h"
#include "ui/base/hit_test.h"
@@ -33,6 +32,7 @@
#include "ui/compositor/dip_util.h"
#include "ui/compositor/layer.h"
#include "ui/compositor/layer_animator.h"
+#include "ui/events/event.h"
#include "ui/gfx/display.h"
#include "ui/gfx/point3_f.h"
#include "ui/gfx/point_conversions.h"
diff --git a/ui/aura/root_window.h b/ui/aura/root_window.h
index 7943802..d403d73 100644
--- a/ui/aura/root_window.h
+++ b/ui/aura/root_window.h
@@ -18,13 +18,13 @@
#include "ui/aura/root_window_host_delegate.h"
#include "ui/aura/window.h"
#include "ui/base/cursor/cursor.h"
-#include "ui/base/events/event_constants.h"
-#include "ui/base/events/event_dispatcher.h"
#include "ui/base/gestures/gesture_recognizer.h"
#include "ui/base/gestures/gesture_types.h"
#include "ui/compositor/compositor.h"
#include "ui/compositor/compositor_observer.h"
#include "ui/compositor/layer_animation_observer.h"
+#include "ui/events/event_constants.h"
+#include "ui/events/event_dispatcher.h"
#include "ui/gfx/native_widget_types.h"
#include "ui/gfx/point.h"
#include "ui/gfx/transform.h"
diff --git a/ui/aura/root_window_host_win.cc b/ui/aura/root_window_host_win.cc
index 723de57..e5658f7 100644
--- a/ui/aura/root_window_host_win.cc
+++ b/ui/aura/root_window_host_win.cc
@@ -13,7 +13,7 @@
#include "ui/aura/client/cursor_client.h"
#include "ui/aura/root_window.h"
#include "ui/base/cursor/cursor_loader_win.h"
-#include "ui/base/events/event.h"
+#include "ui/events/event.h"
#include "ui/base/view_prop.h"
#include "ui/gfx/display.h"
#include "ui/gfx/insets.h"
diff --git a/ui/aura/root_window_host_x11.cc b/ui/aura/root_window_host_x11.cc
index 34b8038..7de3bf7 100644
--- a/ui/aura/root_window_host_x11.cc
+++ b/ui/aura/root_window_host_x11.cc
@@ -32,8 +32,6 @@
#include "ui/aura/env.h"
#include "ui/aura/root_window.h"
#include "ui/base/cursor/cursor.h"
-#include "ui/base/events/event.h"
-#include "ui/base/events/event_utils.h"
#include "ui/base/touch/touch_factory_x11.h"
#include "ui/base/ui_base_switches.h"
#include "ui/base/view_prop.h"
@@ -41,6 +39,8 @@
#include "ui/base/x/x11_util.h"
#include "ui/compositor/dip_util.h"
#include "ui/compositor/layer.h"
+#include "ui/events/event.h"
+#include "ui/events/event_utils.h"
#include "ui/events/keycodes/keyboard_codes.h"
#include "ui/gfx/screen.h"
diff --git a/ui/aura/root_window_unittest.cc b/ui/aura/root_window_unittest.cc
index 92930af..4cf10bc 100644
--- a/ui/aura/root_window_unittest.cc
+++ b/ui/aura/root_window_unittest.cc
@@ -17,11 +17,11 @@
#include "ui/aura/test/test_window_delegate.h"
#include "ui/aura/test/test_windows.h"
#include "ui/aura/window_tracker.h"
-#include "ui/base/events/event.h"
-#include "ui/base/events/event_handler.h"
-#include "ui/base/events/event_utils.h"
#include "ui/base/gestures/gesture_configuration.h"
#include "ui/base/hit_test.h"
+#include "ui/events/event.h"
+#include "ui/events/event_handler.h"
+#include "ui/events/event_utils.h"
#include "ui/events/keycodes/keyboard_codes.h"
#include "ui/gfx/point.h"
#include "ui/gfx/rect.h"
diff --git a/ui/aura/test/event_generator.cc b/ui/aura/test/event_generator.cc
index 91bcee7..ba8392d 100644
--- a/ui/aura/test/event_generator.cc
+++ b/ui/aura/test/event_generator.cc
@@ -9,8 +9,8 @@
#include "base/message_loop/message_loop_proxy.h"
#include "ui/aura/client/screen_position_client.h"
#include "ui/aura/root_window.h"
-#include "ui/base/events/event.h"
-#include "ui/base/events/event_utils.h"
+#include "ui/events/event.h"
+#include "ui/events/event_utils.h"
#include "ui/gfx/vector2d_conversions.h"
#if defined(USE_X11)
diff --git a/ui/aura/test/event_generator.h b/ui/aura/test/event_generator.h
index 36ad695..5f93c5c 100644
--- a/ui/aura/test/event_generator.h
+++ b/ui/aura/test/event_generator.h
@@ -11,7 +11,7 @@
#include "base/basictypes.h"
#include "base/callback.h"
#include "base/memory/scoped_ptr.h"
-#include "ui/base/events/event_constants.h"
+#include "ui/events/event_constants.h"
#include "ui/events/keycodes/keyboard_codes.h"
#include "ui/gfx/point.h"
diff --git a/ui/aura/test/test_event_handler.cc b/ui/aura/test/test_event_handler.cc
index 90563d7..5611a99 100644
--- a/ui/aura/test/test_event_handler.cc
+++ b/ui/aura/test/test_event_handler.cc
@@ -4,7 +4,7 @@
#include "ui/aura/test/test_event_handler.h"
-#include "ui/base/events/event.h"
+#include "ui/events/event.h"
namespace aura {
namespace test {
diff --git a/ui/aura/test/test_event_handler.h b/ui/aura/test/test_event_handler.h
index 0bd8ed8..4998630 100644
--- a/ui/aura/test/test_event_handler.h
+++ b/ui/aura/test/test_event_handler.h
@@ -7,7 +7,7 @@
#include "base/basictypes.h"
#include "base/compiler_specific.h"
-#include "ui/base/events/event_handler.h"
+#include "ui/events/event_handler.h"
namespace aura {
namespace test {
diff --git a/ui/aura/test/test_window_delegate.cc b/ui/aura/test/test_window_delegate.cc
index 37d1198..305dd9a 100644
--- a/ui/aura/test/test_window_delegate.cc
+++ b/ui/aura/test/test_window_delegate.cc
@@ -6,8 +6,8 @@
#include "base/strings/stringprintf.h"
#include "ui/aura/window.h"
-#include "ui/base/events/event.h"
#include "ui/base/hit_test.h"
+#include "ui/events/event.h"
#include "ui/gfx/canvas.h"
#include "ui/gfx/path.h"
#include "ui/gfx/skia_util.h"
diff --git a/ui/aura/window.h b/ui/aura/window.h
index 92dfa90..3ed7ca5 100644
--- a/ui/aura/window.h
+++ b/ui/aura/window.h
@@ -17,13 +17,13 @@
#include "ui/aura/aura_export.h"
#include "ui/aura/client/window_types.h"
#include "ui/aura/window_observer.h"
-#include "ui/base/events/event_constants.h"
-#include "ui/base/events/event_target.h"
#include "ui/base/gestures/gesture_types.h"
#include "ui/compositor/layer_animator.h"
#include "ui/compositor/layer_delegate.h"
#include "ui/compositor/layer_owner.h"
#include "ui/compositor/layer_type.h"
+#include "ui/events/event_constants.h"
+#include "ui/events/event_target.h"
#include "ui/gfx/insets.h"
#include "ui/gfx/native_widget_types.h"
#include "ui/gfx/rect.h"
diff --git a/ui/aura/window_delegate.h b/ui/aura/window_delegate.h
index 6bea65d..ff941ef 100644
--- a/ui/aura/window_delegate.h
+++ b/ui/aura/window_delegate.h
@@ -8,8 +8,8 @@
#include "base/compiler_specific.h"
#include "base/memory/ref_counted.h"
#include "ui/aura/aura_export.h"
-#include "ui/base/events/event_constants.h"
-#include "ui/base/events/event_handler.h"
+#include "ui/events/event_constants.h"
+#include "ui/events/event_handler.h"
#include "ui/gfx/native_widget_types.h"
namespace gfx {
diff --git a/ui/aura/window_unittest.cc b/ui/aura/window_unittest.cc
index 126f358..c37eb83 100644
--- a/ui/aura/window_unittest.cc
+++ b/ui/aura/window_unittest.cc
@@ -27,14 +27,14 @@
#include "ui/aura/window_delegate.h"
#include "ui/aura/window_observer.h"
#include "ui/aura/window_property.h"
-#include "ui/base/events/event.h"
-#include "ui/base/events/event_utils.h"
#include "ui/base/gestures/gesture_configuration.h"
#include "ui/base/hit_test.h"
#include "ui/compositor/layer.h"
#include "ui/compositor/scoped_animation_duration_scale_mode.h"
#include "ui/compositor/scoped_layer_animation_settings.h"
#include "ui/compositor/test/test_layers.h"
+#include "ui/events/event.h"
+#include "ui/events/event_utils.h"
#include "ui/events/keycodes/keyboard_codes.h"
#include "ui/gfx/canvas.h"
#include "ui/gfx/screen.h"
generated by cgit v1.1 at 2025-02-12 12:14:42 +0000