Moves ui/base/events to ui/events

BUG=none TEST=none R=ben@chromium.org TBR=brettw@chromium.org, scherkus@chromium.org, ananta@chromium.org, Review URL: https://codereview.chromium.org/23851041 git-svn-id: svn://svn.chromium.org/chrome/trunk/src@223906 0039d316-1c4b-4281-b951-d872f2087c98
author: sky@chromium.org <sky@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> 2013-09-18 18:11:54 +0000
committer: sky@chromium.org <sky@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> 2013-09-18 18:11:54 +0000
commit: 86ccbd412375d364cd2e1ea6fabbe696998828fe (patch)
tree: 4891f52890bbc3a39983b25229660a4822b1412a /ui
parent: c51461c08853fd38c3eccda1646cfcc3ceff7b06 (diff)
download: chromium_src-86ccbd412375d364cd2e1ea6fabbe696998828fe.zip
chromium_src-86ccbd412375d364cd2e1ea6fabbe696998828fe.tar.gz
chromium_src-86ccbd412375d364cd2e1ea6fabbe696998828fe.tar.bz2
153 files changed, 249 insertions, 249 deletions
diff --git a/ui/app_list/views/apps_grid_view.cc b/ui/app_list/views/apps_grid_view.cc
index 7cb9446..658ddb1 100644
--- a/ui/app_list/views/apps_grid_view.cc
+++ b/ui/app_list/views/apps_grid_view.cc
@@ -13,8 +13,8 @@
 #include "ui/app_list/views/apps_grid_view_delegate.h"
 #include "ui/app_list/views/page_switcher.h"
 #include "ui/app_list/views/pulsing_block_view.h"
-#include "ui/base/events/event.h"
 #include "ui/compositor/scoped_layer_animation_settings.h"
+#include "ui/events/event.h"
 #include "ui/gfx/animation/animation.h"
 #include "ui/views/border.h"
 #include "ui/views/view_model_utils.h"
diff --git a/ui/app_list/views/contents_view.cc b/ui/app_list/views/contents_view.cc
index 7d14d17..9f0602c 100644
--- a/ui/app_list/views/contents_view.cc
+++ b/ui/app_list/views/contents_view.cc
@@ -12,7 +12,7 @@
 #include "ui/app_list/views/app_list_main_view.h"
 #include "ui/app_list/views/apps_grid_view.h"
 #include "ui/app_list/views/search_result_list_view.h"
-#include "ui/base/events/event.h"
+#include "ui/events/event.h"
 #include "ui/views/animation/bounds_animator.h"
 #include "ui/views/view_model.h"
 #include "ui/views/view_model_utils.h"
diff --git a/ui/app_list/views/search_box_view.cc b/ui/app_list/views/search_box_view.cc
index 0f9158f..9b96d3e 100644
--- a/ui/app_list/views/search_box_view.cc
+++ b/ui/app_list/views/search_box_view.cc
@@ -11,8 +11,8 @@
 #include "ui/app_list/search_box_model.h"
 #include "ui/app_list/views/app_list_menu_views.h"
 #include "ui/app_list/views/search_box_view_delegate.h"
-#include "ui/base/events/event.h"
 #include "ui/base/resource/resource_bundle.h"
+#include "ui/events/event.h"
 #include "ui/views/controls/button/menu_button.h"
 #include "ui/views/controls/image_view.h"
 #include "ui/views/controls/textfield/textfield.h"
diff --git a/ui/app_list/views/search_result_list_view.cc b/ui/app_list/views/search_result_list_view.cc
index 9e61432..3387cec 100644
--- a/ui/app_list/views/search_result_list_view.cc
+++ b/ui/app_list/views/search_result_list_view.cc
@@ -10,7 +10,7 @@
 #include "base/message_loop/message_loop.h"
 #include "ui/app_list/views/search_result_list_view_delegate.h"
 #include "ui/app_list/views/search_result_view.h"
-#include "ui/base/events/event.h"
+#include "ui/events/event.h"
 #include "ui/views/layout/box_layout.h"
 
 namespace {
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"
diff --git a/ui/base/accelerators/accelerator.h b/ui/base/accelerators/accelerator.h
index c2e2aa6..020c7be 100644
--- a/ui/base/accelerators/accelerator.h
+++ b/ui/base/accelerators/accelerator.h
@@ -14,8 +14,8 @@
 #include "base/memory/scoped_ptr.h"
 #include "base/strings/string16.h"
 #include "ui/base/accelerators/platform_accelerator.h"
-#include "ui/base/events/event_constants.h"
 #include "ui/base/ui_export.h"
+#include "ui/events/event_constants.h"
 #include "ui/events/keycodes/keyboard_codes.h"
 
 namespace ui {
diff --git a/ui/base/accelerators/accelerator_manager.h b/ui/base/accelerators/accelerator_manager.h
index 2e6645e..818dc3e 100644
--- a/ui/base/accelerators/accelerator_manager.h
+++ b/ui/base/accelerators/accelerator_manager.h
@@ -11,8 +11,8 @@
 
 #include "base/basictypes.h"
 #include "ui/base/accelerators/accelerator.h"
-#include "ui/base/events/event_constants.h"
 #include "ui/base/ui_export.h"
+#include "ui/events/event_constants.h"
 
 namespace ui {
 
diff --git a/ui/base/accelerators/accelerator_manager_unittest.cc b/ui/base/accelerators/accelerator_manager_unittest.cc
index 46e0bc1..b8672ec 100644
--- a/ui/base/accelerators/accelerator_manager_unittest.cc
+++ b/ui/base/accelerators/accelerator_manager_unittest.cc
@@ -6,7 +6,7 @@
 
 #include "base/compiler_specific.h"
 #include "testing/gtest/include/gtest/gtest.h"
-#include "ui/base/events/event_constants.h"
+#include "ui/events/event_constants.h"
 #include "ui/events/keycodes/keyboard_codes.h"
 
 namespace ui {
diff --git a/ui/base/accelerators/platform_accelerator_gtk.cc b/ui/base/accelerators/platform_accelerator_gtk.cc
index 0e0ad34..d77050c 100644
--- a/ui/base/accelerators/platform_accelerator_gtk.cc
+++ b/ui/base/accelerators/platform_accelerator_gtk.cc
@@ -4,7 +4,7 @@
 
 #include "ui/base/accelerators/platform_accelerator_gtk.h"
 
-#include "ui/base/events/event_conversion_gtk.h"
+#include "ui/events/event_conversion_gtk.h"
 #include "ui/events/keycodes/keyboard_code_conversion_gtk.h"
 
 namespace ui {
diff --git a/ui/base/cocoa/cocoa_event_utils.mm b/ui/base/cocoa/cocoa_event_utils.mm
index 1920699..a8fd8c3 100644
--- a/ui/base/cocoa/cocoa_event_utils.mm
+++ b/ui/base/cocoa/cocoa_event_utils.mm
@@ -4,7 +4,7 @@
 
 #import "ui/base/cocoa/cocoa_event_utils.h"
 
-#include "ui/base/events/event_constants.h"
+#include "ui/events/event_constants.h"
 #include "ui/base/window_open_disposition.h"
 
 namespace {
diff --git a/ui/base/cocoa/cocoa_event_utils_unittest.mm b/ui/base/cocoa/cocoa_event_utils_unittest.mm
index cb5f68a..5ec3936 100644
--- a/ui/base/cocoa/cocoa_event_utils_unittest.mm
+++ b/ui/base/cocoa/cocoa_event_utils_unittest.mm
@@ -7,7 +7,7 @@
 #include "testing/gtest/include/gtest/gtest.h"
 #include "testing/platform_test.h"
 #include "ui/base/cocoa/cocoa_event_utils.h"
-#include "ui/base/events/event_constants.h"
+#include "ui/events/event_constants.h"
 #import "ui/base/test/cocoa_test_event_utils.h"
 #import "ui/base/test/ui_cocoa_test_helper.h"
 
diff --git a/ui/base/cocoa/events_mac.mm b/ui/base/cocoa/events_mac.mm
index 878240d..da08510 100644
--- a/ui/base/cocoa/events_mac.mm
+++ b/ui/base/cocoa/events_mac.mm
@@ -4,12 +4,12 @@
 
 #include <Cocoa/Cocoa.h>
 
-#include "ui/base/events/event_constants.h"
+#include "ui/events/event_constants.h"
 
 #include "base/event_types.h"
 #include "base/logging.h"
 #include "base/time/time.h"
-#include "ui/base/events/event_utils.h"
+#include "ui/events/event_utils.h"
 #import "ui/events/keycodes/keyboard_code_conversion_mac.h"
 #include "ui/gfx/point.h"
 
diff --git a/ui/base/cocoa/events_mac_unittest.mm b/ui/base/cocoa/events_mac_unittest.mm
index cf641c8..63f5319 100644
--- a/ui/base/cocoa/events_mac_unittest.mm
+++ b/ui/base/cocoa/events_mac_unittest.mm
@@ -5,8 +5,8 @@
 #import <Cocoa/Cocoa.h>
 
 #include "testing/gtest/include/gtest/gtest.h"
-#include "ui/base/events/event_constants.h"
-#include "ui/base/events/event_utils.h"
+#include "ui/events/event_constants.h"
+#include "ui/events/event_utils.h"
 #include "ui/base/test/cocoa_test_event_utils.h"
 #import "ui/base/test/ui_cocoa_test_helper.h"
 #include "ui/gfx/point.h"
diff --git a/ui/base/gestures/gesture_point.cc b/ui/base/gestures/gesture_point.cc
index 29b382f..2233bf1 100644
--- a/ui/base/gestures/gesture_point.cc
+++ b/ui/base/gestures/gesture_point.cc
@@ -7,11 +7,11 @@
 #include <cmath>
 
 #include "base/basictypes.h"
-#include "ui/base/events/event.h"
-#include "ui/base/events/event_constants.h"
 #include "ui/base/gestures/gesture_configuration.h"
 #include "ui/base/gestures/gesture_types.h"
 #include "ui/base/gestures/gesture_util.h"
+#include "ui/events/event.h"
+#include "ui/events/event_constants.h"
 
 namespace ui {
 
diff --git a/ui/base/gestures/gesture_recognizer.h b/ui/base/gestures/gesture_recognizer.h
index 2affc7a..dbb139b 100644
--- a/ui/base/gestures/gesture_recognizer.h
+++ b/ui/base/gestures/gesture_recognizer.h
@@ -8,9 +8,9 @@
 #include <vector>
 
 #include "base/memory/scoped_vector.h"
-#include "ui/base/events/event_constants.h"
 #include "ui/base/gestures/gesture_types.h"
 #include "ui/base/ui_export.h"
+#include "ui/events/event_constants.h"
 
 namespace ui {
 // A GestureRecognizer is an abstract base class for conversion of touch events
diff --git a/ui/base/gestures/gesture_recognizer_impl.cc b/ui/base/gestures/gesture_recognizer_impl.cc
index 0e315a1..51aaa30 100644
--- a/ui/base/gestures/gesture_recognizer_impl.cc
+++ b/ui/base/gestures/gesture_recognizer_impl.cc
@@ -7,12 +7,12 @@
 #include "base/logging.h"
 #include "base/memory/scoped_ptr.h"
 #include "base/time/time.h"
-#include "ui/base/events/event.h"
-#include "ui/base/events/event_constants.h"
-#include "ui/base/events/event_utils.h"
 #include "ui/base/gestures/gesture_configuration.h"
 #include "ui/base/gestures/gesture_sequence.h"
 #include "ui/base/gestures/gesture_types.h"
+#include "ui/events/event.h"
+#include "ui/events/event_constants.h"
+#include "ui/events/event_utils.h"
 
 namespace ui {
 
diff --git a/ui/base/gestures/gesture_recognizer_impl.h b/ui/base/gestures/gesture_recognizer_impl.h
index 812bc05..5f9caf2 100644
--- a/ui/base/gestures/gesture_recognizer_impl.h
+++ b/ui/base/gestures/gesture_recognizer_impl.h
@@ -10,9 +10,9 @@
 
 #include "base/memory/linked_ptr.h"
 #include "base/memory/scoped_ptr.h"
-#include "ui/base/events/event_constants.h"
 #include "ui/base/gestures/gesture_recognizer.h"
 #include "ui/base/ui_export.h"
+#include "ui/events/event_constants.h"
 #include "ui/gfx/point.h"
 
 namespace ui {
diff --git a/ui/base/gestures/gesture_sequence.cc b/ui/base/gestures/gesture_sequence.cc
index ea2aafb..5d3619d 100644
--- a/ui/base/gestures/gesture_sequence.cc
+++ b/ui/base/gestures/gesture_sequence.cc
@@ -12,11 +12,11 @@
 #include "base/memory/scoped_ptr.h"
 #include "base/strings/string_number_conversions.h"
 #include "base/time/time.h"
-#include "ui/base/events/event.h"
-#include "ui/base/events/event_constants.h"
 #include "ui/base/gestures/gesture_configuration.h"
 #include "ui/base/gestures/gesture_util.h"
 #include "ui/base/ui_base_switches.h"
+#include "ui/events/event.h"
+#include "ui/events/event_constants.h"
 #include "ui/gfx/rect.h"
 
 namespace ui {
diff --git a/ui/base/gestures/gesture_sequence.h b/ui/base/gestures/gesture_sequence.h
index 41dc009..ddb9083 100644
--- a/ui/base/gestures/gesture_sequence.h
+++ b/ui/base/gestures/gesture_sequence.h
@@ -6,9 +6,9 @@
 #define UI_BASE_GESTURES_GESTURE_SEQUENCE_H_
 
 #include "base/timer/timer.h"
-#include "ui/base/events/event_constants.h"
 #include "ui/base/gestures/gesture_point.h"
 #include "ui/base/gestures/gesture_recognizer.h"
+#include "ui/events/event_constants.h"
 #include "ui/gfx/rect.h"
 
 namespace ui {
diff --git a/ui/base/gestures/gesture_types.h b/ui/base/gestures/gesture_types.h
index 584ea17..bea1553 100644
--- a/ui/base/gestures/gesture_types.h
+++ b/ui/base/gestures/gesture_types.h
@@ -6,7 +6,7 @@
 #define UI_BASE_GESTURES_GESTURE_TYPES_H_
 
 #include "base/logging.h"
-#include "ui/base/events/event_constants.h"
+#include "ui/events/event_constants.h"
 #include "ui/gfx/rect.h"
 
 namespace ui {
diff --git a/ui/base/ime/character_composer.cc b/ui/base/ime/character_composer.cc
index 0402be2..27cdbec 100644
--- a/ui/base/ime/character_composer.cc
+++ b/ui/base/ime/character_composer.cc
@@ -14,9 +14,9 @@
 // Note for Gtk removal: gdkkeysyms.h only contains a set of
 // '#define GDK_KeyName 0xNNNN' macros and does not #include any Gtk headers.
 #include "third_party/gtk+/gdk/gdkkeysyms.h"
-#include "ui/base/events/event_constants.h"
 #include "ui/base/glib/glib_integers.h"
 #include "ui/base/x/x11_util.h"
+#include "ui/events/event_constants.h"
 
 // Note for Gtk removal: gtkimcontextsimpleseqs.h does not #include any Gtk
 // headers and only contains one big guint16 array |gtk_compose_seqs_compact|
diff --git a/ui/base/ime/character_composer_unittest.cc b/ui/base/ime/character_composer_unittest.cc
index 9a79219..0710204 100644
--- a/ui/base/ime/character_composer_unittest.cc
+++ b/ui/base/ime/character_composer_unittest.cc
@@ -7,8 +7,8 @@
 #include "base/strings/utf_string_conversions.h"
 #include "testing/gtest/include/gtest/gtest.h"
 #include "third_party/gtk+/gdk/gdkkeysyms.h"
-#include "ui/base/events/event_constants.h"
 #include "ui/base/glib/glib_integers.h"
+#include "ui/events/event_constants.h"
 
 namespace ui {
 
diff --git a/ui/base/ime/fake_input_method.cc b/ui/base/ime/fake_input_method.cc
index ff3f5e4cf..2173616 100644
--- a/ui/base/ime/fake_input_method.cc
+++ b/ui/base/ime/fake_input_method.cc
@@ -6,12 +6,12 @@
 
 #include "base/logging.h"
 #include "base/strings/string16.h"
-#include "ui/base/events/event.h"
-#include "ui/base/events/event_constants.h"
-#include "ui/base/events/event_utils.h"
 #include "ui/base/glib/glib_integers.h"
 #include "ui/base/ime/input_method_delegate.h"
 #include "ui/base/ime/text_input_client.h"
+#include "ui/events/event.h"
+#include "ui/events/event_constants.h"
+#include "ui/events/event_utils.h"
 #include "ui/events/keycodes/keyboard_code_conversion.h"
 
 #if defined(USE_X11)
diff --git a/ui/base/ime/input_method_base.h b/ui/base/ime/input_method_base.h
index c5dcfd6..665070a 100644
--- a/ui/base/ime/input_method_base.h
+++ b/ui/base/ime/input_method_base.h
@@ -8,9 +8,9 @@
 #include "base/basictypes.h"
 #include "base/compiler_specific.h"
 #include "base/observer_list.h"
-#include "ui/base/events/event_constants.h"
 #include "ui/base/ime/input_method.h"
 #include "ui/base/ui_export.h"
+#include "ui/events/event_constants.h"
 
 namespace gfx {
 class Rect;
diff --git a/ui/base/ime/input_method_base_unittest.cc b/ui/base/ime/input_method_base_unittest.cc
index a0558c2..cc7304c 100644
--- a/ui/base/ime/input_method_base_unittest.cc
+++ b/ui/base/ime/input_method_base_unittest.cc
@@ -6,9 +6,9 @@
 
 #include "base/scoped_observer.h"
 #include "testing/gtest/include/gtest/gtest.h"
-#include "ui/base/events/event.h"
 #include "ui/base/ime/dummy_text_input_client.h"
 #include "ui/base/ime/input_method_observer.h"
+#include "ui/events/event.h"
 
 namespace ui {
 namespace {
diff --git a/ui/base/ime/input_method_delegate.h b/ui/base/ime/input_method_delegate.h
index d7e5ea2..2131943 100644
--- a/ui/base/ime/input_method_delegate.h
+++ b/ui/base/ime/input_method_delegate.h
@@ -6,8 +6,8 @@
 #define UI_BASE_IME_INPUT_METHOD_DELEGATE_H_
 
 #include "base/event_types.h"
-#include "ui/base/events/event_constants.h"
 #include "ui/base/ui_export.h"
+#include "ui/events/event_constants.h"
 #include "ui/events/keycodes/keyboard_codes.h"
 
 namespace ui {
diff --git a/ui/base/ime/input_method_ibus.cc b/ui/base/ime/input_method_ibus.cc
index 0a5d954..5db106e 100644
--- a/ui/base/ime/input_method_ibus.cc
+++ b/ui/base/ime/input_method_ibus.cc
@@ -26,10 +26,10 @@
 #include "chromeos/dbus/ibus/ibus_text.h"
 #include "chromeos/ime/input_method_descriptor.h"
 #include "chromeos/ime/input_method_manager.h"
-#include "ui/base/events/event.h"
-#include "ui/base/events/event_constants.h"
-#include "ui/base/events/event_utils.h"
 #include "ui/base/ime/text_input_client.h"
+#include "ui/events/event.h"
+#include "ui/events/event_constants.h"
+#include "ui/events/event_utils.h"
 #include "ui/events/keycodes/keyboard_code_conversion.h"
 #include "ui/events/keycodes/keyboard_code_conversion_x.h"
 #include "ui/events/keycodes/keyboard_codes.h"
@@ -185,7 +185,7 @@ bool InputMethodIBus::DispatchKeyEvent(const base::NativeEvent& native_event) {
   pending_key_events_.insert(current_keyevent_id_);
 
   // Since |native_event| might be treated as XEvent whose size is bigger than
-  // XKeyEvent e.g. in CopyNativeEvent() in ui/base/events/event.cc, allocating
+  // XKeyEvent e.g. in CopyNativeEvent() in ui/events/event.cc, allocating
   // |event| as XKeyEvent and casting it to XEvent is unsafe. crbug.com/151884
   XEvent* event = new XEvent;
   *event = *native_event;
diff --git a/ui/base/ime/input_method_win.cc b/ui/base/ime/input_method_win.cc
index 343a861..bf679ed 100644
--- a/ui/base/ime/input_method_win.cc
+++ b/ui/base/ime/input_method_win.cc
@@ -5,10 +5,10 @@
 #include "ui/base/ime/input_method_win.h"
 
 #include "base/basictypes.h"
-#include "ui/base/events/event.h"
-#include "ui/base/events/event_constants.h"
-#include "ui/base/events/event_utils.h"
 #include "ui/base/ime/text_input_client.h"
+#include "ui/events/event.h"
+#include "ui/events/event_constants.h"
+#include "ui/events/event_utils.h"
 #include "ui/events/keycodes/keyboard_codes.h"
 #include "ui/gfx/win/hwnd_util.h"
 
diff --git a/ui/base/ozone/evdev/key_event_converter_ozone.cc b/ui/base/ozone/evdev/key_event_converter_ozone.cc
index 10da4a1..66ec892 100644
--- a/ui/base/ozone/evdev/key_event_converter_ozone.cc
+++ b/ui/base/ozone/evdev/key_event_converter_ozone.cc
@@ -6,7 +6,7 @@
 
 #include <linux/input.h>
 
-#include "ui/base/events/event.h"
+#include "ui/events/event.h"
 #include "ui/events/keycodes/keyboard_codes.h"
 
 namespace {
diff --git a/ui/base/ozone/evdev/touch_event_converter_ozone.cc b/ui/base/ozone/evdev/touch_event_converter_ozone.cc
index 148ed72..e34adcd 100644
--- a/ui/base/ozone/evdev/touch_event_converter_ozone.cc
+++ b/ui/base/ozone/evdev/touch_event_converter_ozone.cc
@@ -18,9 +18,9 @@
 #include "base/logging.h"
 #include "base/message_loop/message_loop.h"
 #include "base/message_loop/message_pump_ozone.h"
-#include "ui/base/events/event.h"
-#include "ui/base/events/event_constants.h"
 #include "ui/base/ozone/surface_factory_ozone.h"
+#include "ui/events/event.h"
+#include "ui/events/event_constants.h"
 
 namespace {
 
diff --git a/ui/base/ozone/evdev/touch_event_converter_ozone.h b/ui/base/ozone/evdev/touch_event_converter_ozone.h
index 24be78e..62f1bfe 100644
--- a/ui/base/ozone/evdev/touch_event_converter_ozone.h
+++ b/ui/base/ozone/evdev/touch_event_converter_ozone.h
@@ -8,9 +8,9 @@
 #include <bitset>
 
 #include "base/compiler_specific.h"
-#include "ui/base/events/event_constants.h"
 #include "ui/base/ozone/event_converter_ozone.h"
 #include "ui/base/ui_export.h"
+#include "ui/events/event_constants.h"
 
 namespace ui {
 
diff --git a/ui/base/ozone/evdev/touch_event_converter_ozone_unittest.cc b/ui/base/ozone/evdev/touch_event_converter_ozone_unittest.cc
index 61bf54b..b75741d 100644
--- a/ui/base/ozone/evdev/touch_event_converter_ozone_unittest.cc
+++ b/ui/base/ozone/evdev/touch_event_converter_ozone_unittest.cc
@@ -16,8 +16,8 @@
 #include "base/run_loop.h"
 #include "base/time/time.h"
 #include "testing/gtest/include/gtest/gtest.h"
-#include "ui/base/events/event.h"
 #include "ui/base/ozone/evdev/touch_event_converter_ozone.h"
+#include "ui/events/event.h"
 
 namespace {
 
diff --git a/ui/base/ozone/event_converter_ozone.cc b/ui/base/ozone/event_converter_ozone.cc
index 485ea22..95d52f8 100644
--- a/ui/base/ozone/event_converter_ozone.cc
+++ b/ui/base/ozone/event_converter_ozone.cc
@@ -7,7 +7,7 @@
 #include "base/bind.h"
 #include "base/message_loop/message_loop.h"
 #include "base/message_loop/message_pump_ozone.h"
-#include "ui/base/events/event.h"
+#include "ui/events/event.h"
 
 namespace {
 
diff --git a/ui/base/ozone/events_ozone.cc b/ui/base/ozone/events_ozone.cc
index cad17f6..0db40f4 100644
--- a/ui/base/ozone/events_ozone.cc
+++ b/ui/base/ozone/events_ozone.cc
@@ -2,9 +2,9 @@
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
-#include "ui/base/events/event.h"
-#include "ui/base/events/event_constants.h"
-#include "ui/base/events/event_utils.h"
+#include "ui/events/event.h"
+#include "ui/events/event_constants.h"
+#include "ui/events/event_utils.h"
 
 namespace ui {
 
diff --git a/ui/base/ui_base_types.cc b/ui/base/ui_base_types.cc
index 2d3f8127..e757edb 100644
--- a/ui/base/ui_base_types.cc
+++ b/ui/base/ui_base_types.cc
@@ -4,7 +4,7 @@
 
 #include "ui/base/ui_base_types.h"
 
-#include "ui/base/events/event.h"
+#include "ui/events/event.h"
 
 namespace ui {
 
diff --git a/ui/base/win/events_win.cc b/ui/base/win/events_win.cc
index 94faf21..04b9cd0 100644
--- a/ui/base/win/events_win.cc
+++ b/ui/base/win/events_win.cc
@@ -4,12 +4,12 @@
 
 #include <windowsx.h>
 
-#include "ui/base/events/event_constants.h"
+#include "ui/events/event_constants.h"
 
 #include "base/logging.h"
 #include "base/time/time.h"
 #include "base/win/win_util.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/gfx/point.h"
 #include "ui/gfx/win/dpi.h"
diff --git a/ui/base/window_open_disposition.cc b/ui/base/window_open_disposition.cc
index 5e27bcc..c0d131f 100644
--- a/ui/base/window_open_disposition.cc
+++ b/ui/base/window_open_disposition.cc
@@ -5,7 +5,7 @@
 #include "ui/base/window_open_disposition.h"
 
 #include "build/build_config.h"
-#include "ui/base/events/event_constants.h"
+#include "ui/events/event_constants.h"
 
 namespace ui {
 
diff --git a/ui/base/x/device_data_manager.cc b/ui/base/x/device_data_manager.cc
index 91a021b..390abdb 100644
--- a/ui/base/x/device_data_manager.cc
+++ b/ui/base/x/device_data_manager.cc
@@ -10,11 +10,11 @@
 
 #include "base/logging.h"
 #include "base/memory/singleton.h"
-#include "ui/base/events/event_constants.h"
-#include "ui/base/events/event_utils.h"
 #include "ui/base/touch/touch_factory_x11.h"
 #include "ui/base/x/device_list_cache_x.h"
 #include "ui/base/x/x11_util.h"
+#include "ui/events/event_constants.h"
+#include "ui/events/event_utils.h"
 
 // XIScrollClass was introduced in XI 2.1 so we need to define it here
 // for backward-compatibility with older versions of XInput.
diff --git a/ui/base/x/device_data_manager.h b/ui/base/x/device_data_manager.h
index 82718ab..f07012f 100644
--- a/ui/base/x/device_data_manager.h
+++ b/ui/base/x/device_data_manager.h
@@ -13,9 +13,9 @@
 
 #include "base/basictypes.h"
 #include "base/event_types.h"
-#include "ui/base/events/event_constants.h"
 #include "ui/base/ui_export.h"
 #include "ui/base/x/x11_atom_cache.h"
+#include "ui/events/event_constants.h"
 
 template <typename T> struct DefaultSingletonTraits;
 
diff --git a/ui/base/x/events_x.cc b/ui/base/x/events_x.cc
index e3b917b..baa3bcf 100644
--- a/ui/base/x/events_x.cc
+++ b/ui/base/x/events_x.cc
@@ -2,7 +2,7 @@
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
-#include "ui/base/events/event_constants.h"
+#include "ui/events/event_constants.h"
 
 #include <string.h>
 #include <X11/extensions/XInput.h>
@@ -12,12 +12,12 @@
 #include "base/logging.h"
 #include "base/memory/singleton.h"
 #include "base/message_loop/message_pump_x11.h"
-#include "ui/base/events/event_utils.h"
 #include "ui/base/touch/touch_factory_x11.h"
 #include "ui/base/x/device_data_manager.h"
 #include "ui/base/x/device_list_cache_x.h"
 #include "ui/base/x/x11_atom_cache.h"
 #include "ui/base/x/x11_util.h"
+#include "ui/events/event_utils.h"
 #include "ui/events/keycodes/keyboard_code_conversion_x.h"
 #include "ui/gfx/display.h"
 #include "ui/gfx/point.h"
diff --git a/ui/base/x/events_x_unittest.cc b/ui/base/x/events_x_unittest.cc
index 232c026..3a85a0a 100644
--- a/ui/base/x/events_x_unittest.cc
+++ b/ui/base/x/events_x_unittest.cc
@@ -12,11 +12,11 @@
 #undef None
 
 #include "testing/gtest/include/gtest/gtest.h"
-#include "ui/base/events/event.h"
-#include "ui/base/events/event_constants.h"
-#include "ui/base/events/event_utils.h"
 #include "ui/base/touch/touch_factory_x11.h"
 #include "ui/base/x/device_data_manager.h"
+#include "ui/events/event.h"
+#include "ui/events/event_constants.h"
+#include "ui/events/event_utils.h"
 #include "ui/gfx/point.h"
 
 namespace ui {
diff --git a/ui/base/x/x11_util.cc b/ui/base/x/x11_util.cc
index 122b469..a51e6e5 100644
--- a/ui/base/x/x11_util.cc
+++ b/ui/base/x/x11_util.cc
@@ -34,11 +34,11 @@
 #include "base/threading/thread.h"
 #include "third_party/skia/include/core/SkBitmap.h"
 #include "third_party/skia/include/core/SkPostConfig.h"
-#include "ui/base/events/event_utils.h"
 #include "ui/base/touch/touch_factory_x11.h"
 #include "ui/base/x/device_data_manager.h"
 #include "ui/base/x/x11_error_tracker.h"
 #include "ui/base/x/x11_util_internal.h"
+#include "ui/events/event_utils.h"
 #include "ui/events/keycodes/keyboard_code_conversion_x.h"
 #include "ui/gfx/canvas.h"
 #include "ui/gfx/image/image_skia.h"
diff --git a/ui/base/x/x11_util.h b/ui/base/x/x11_util.h
index 5163537..24a4418 100644
--- a/ui/base/x/x11_util.h
+++ b/ui/base/x/x11_util.h
@@ -17,8 +17,8 @@
 #include "base/basictypes.h"
 #include "base/event_types.h"
 #include "base/memory/ref_counted_memory.h"
-#include "ui/base/events/event_constants.h"
 #include "ui/base/ui_export.h"
+#include "ui/events/event_constants.h"
 #include "ui/events/keycodes/keyboard_codes.h"
 #include "ui/gfx/point.h"
 
diff --git a/ui/base/events/OWNERS b/ui/events/OWNERS
index b8e32c1..b8e32c1 100644
--- a/ui/base/events/OWNERS
+++ b/ui/events/OWNERS
diff --git a/ui/base/events/event.cc b/ui/events/event.cc
index 9fc80d4..46c31a6 100644
--- a/ui/base/events/event.cc
+++ b/ui/events/event.cc
@@ -2,7 +2,7 @@
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
-#include "ui/base/events/event.h"
+#include "ui/events/event.h"
 
 #if defined(USE_X11)
 #include <X11/Xlib.h>
@@ -13,7 +13,7 @@
 
 #include "base/metrics/histogram.h"
 #include "base/strings/stringprintf.h"
-#include "ui/base/events/event_utils.h"
+#include "ui/events/event_utils.h"
 #include "ui/events/keycodes/keyboard_code_conversion.h"
 #include "ui/gfx/point3_f.h"
 #include "ui/gfx/point_conversions.h"
diff --git a/ui/base/events/event.h b/ui/events/event.h
index d305574..be2587f 100644
--- a/ui/base/events/event.h
+++ b/ui/events/event.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_BASE_EVENTS_EVENT_H_
-#define UI_BASE_EVENTS_EVENT_H_
+#ifndef UI_EVENTS_EVENT_H_
+#define UI_EVENTS_EVENT_H_
 
 #include "base/basictypes.h"
 #include "base/compiler_specific.h"
@@ -11,10 +11,10 @@
 #include "base/logging.h"
 #include "base/time/time.h"
 #include "ui/base/dragdrop/os_exchange_data.h"
-#include "ui/base/events/event_constants.h"
 #include "ui/base/gestures/gesture_types.h"
 #include "ui/base/latency_info.h"
 #include "ui/base/ui_export.h"
+#include "ui/events/event_constants.h"
 #include "ui/events/keycodes/keyboard_codes.h"
 #include "ui/gfx/point.h"
 
@@ -716,4 +716,4 @@ class UI_EXPORT GestureEvent : public LocatedEvent {
 
 }  // namespace ui
 
-#endif  // UI_BASE_EVENTS_EVENT_H_
+#endif  // UI_EVENTS_EVENT_H_
diff --git a/ui/base/events/event_constants.h b/ui/events/event_constants.h
index 2c04770..6c0e9f7 100644
--- a/ui/base/events/event_constants.h
+++ b/ui/events/event_constants.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_BASE_EVENTS_EVENT_CONSTANTS_H_
-#define UI_BASE_EVENTS_EVENT_CONSTANTS_H_
+#ifndef UI_EVENTS_EVENT_CONSTANTS_H_
+#define UI_EVENTS_EVENT_CONSTANTS_H_
 
 namespace ui {
 
@@ -113,4 +113,4 @@ enum EventPhase {
 
 }  // namespace ui
 
-#endif  // UI_BASE_EVENTS_EVENT_CONSTANTS_H_
+#endif  // UI_EVENTS_EVENT_CONSTANTS_H_
diff --git a/ui/base/events/event_conversion_gtk.cc b/ui/events/event_conversion_gtk.cc
index bc15dac..c0a5738 100644
--- a/ui/base/events/event_conversion_gtk.cc
+++ b/ui/events/event_conversion_gtk.cc
@@ -2,9 +2,9 @@
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
-#include "ui/base/events/event_conversion_gtk.h"
+#include "ui/events/event_conversion_gtk.h"
 
-#include "ui/base/events/event_constants.h"
+#include "ui/events/event_constants.h"
 
 namespace ui {
 
diff --git a/ui/base/events/event_conversion_gtk.h b/ui/events/event_conversion_gtk.h
index a78d092..f1019837 100644
--- a/ui/base/events/event_conversion_gtk.h
+++ b/ui/events/event_conversion_gtk.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_BASE_EVENTS_EVENT_CONVERSION_GTK_H_
-#define UI_BASE_EVENTS_EVENT_CONVERSION_GTK_H_
+#ifndef UI_EVENTS_EVENT_CONVERSION_GTK_H_
+#define UI_EVENTS_EVENT_CONVERSION_GTK_H_
 
 #include <gtk/gtk.h>
 
@@ -17,4 +17,4 @@ UI_EXPORT GdkModifierType EventFlagToGdkModifier(int event_flag);
 
 }  // namespace ui
 
-#endif  // UI_BASE_EVENTS_EVENT_CONVERSION_GTK_H_
+#endif  // UI_EVENTS_EVENT_CONVERSION_GTK_H_
diff --git a/ui/base/events/event_dispatcher.cc b/ui/events/event_dispatcher.cc
index 06c857c..b774b94 100644
--- a/ui/base/events/event_dispatcher.cc
+++ b/ui/events/event_dispatcher.cc
@@ -2,7 +2,7 @@
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
-#include "ui/base/events/event_dispatcher.h"
+#include "ui/events/event_dispatcher.h"
 
 #include <algorithm>
 
diff --git a/ui/base/events/event_dispatcher.h b/ui/events/event_dispatcher.h
index b9fd0dc..caaa514 100644
--- a/ui/base/events/event_dispatcher.h
+++ b/ui/events/event_dispatcher.h
@@ -2,14 +2,14 @@
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
-#ifndef UI_BASE_EVENTS_EVENT_DISPATCHER_H_
-#define UI_BASE_EVENTS_EVENT_DISPATCHER_H_
+#ifndef UI_EVENTS_EVENT_DISPATCHER_H_
+#define UI_EVENTS_EVENT_DISPATCHER_H_
 
 #include "base/auto_reset.h"
-#include "ui/base/events/event.h"
-#include "ui/base/events/event_constants.h"
-#include "ui/base/events/event_target.h"
 #include "ui/base/ui_export.h"
+#include "ui/events/event.h"
+#include "ui/events/event_constants.h"
+#include "ui/events/event_target.h"
 
 namespace ui {
 
@@ -77,4 +77,4 @@ class UI_EXPORT EventDispatcher {
 
 }  // namespace ui
 
-#endif  // UI_BASE_EVENTS_EVENT_DISPATCHER_H_
+#endif  // UI_EVENTS_EVENT_DISPATCHER_H_
diff --git a/ui/base/events/event_dispatcher_unittest.cc b/ui/events/event_dispatcher_unittest.cc
index 41ab048..b0b3b8a 100644
--- a/ui/base/events/event_dispatcher_unittest.cc
+++ b/ui/events/event_dispatcher_unittest.cc
@@ -2,11 +2,11 @@
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
-#include "ui/base/events/event_dispatcher.h"
+#include "ui/events/event_dispatcher.h"
 
 #include "testing/gtest/include/gtest/gtest.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"
 
 namespace ui {
 
diff --git a/ui/base/events/event_handler.cc b/ui/events/event_handler.cc
index 99295b15..243007a 100644
--- a/ui/base/events/event_handler.cc
+++ b/ui/events/event_handler.cc
@@ -2,10 +2,10 @@
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
-#include "ui/base/events/event_dispatcher.h"
-#include "ui/base/events/event_handler.h"
+#include "ui/events/event_handler.h"
 
-#include "ui/base/events/event.h"
+#include "ui/events/event.h"
+#include "ui/events/event_dispatcher.h"
 
 namespace ui {
 
diff --git a/ui/base/events/event_handler.h b/ui/events/event_handler.h
index 6ecc389..bee8690 100644
--- a/ui/base/events/event_handler.h
+++ b/ui/events/event_handler.h
@@ -2,15 +2,15 @@
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
-#ifndef UI_BASE_EVENTS_EVENT_HANDLER_H_
-#define UI_BASE_EVENTS_EVENT_HANDLER_H_
+#ifndef UI_EVENTS_EVENT_HANDLER_H_
+#define UI_EVENTS_EVENT_HANDLER_H_
 
 #include <stack>
 #include <vector>
 
 #include "base/basictypes.h"
-#include "ui/base/events/event_constants.h"
 #include "ui/base/ui_export.h"
+#include "ui/events/event_constants.h"
 
 namespace ui {
 
@@ -63,4 +63,4 @@ typedef std::vector<EventHandler*> EventHandlerList;
 
 }  // namespace ui
 
-#endif  // UI_BASE_EVENTS_EVENT_HANDLER_H_
+#endif  // UI_EVENTS_EVENT_HANDLER_H_
diff --git a/ui/base/events/event_target.cc b/ui/events/event_target.cc
index 7ef69c8..9aa53902 100644
--- a/ui/base/events/event_target.cc
+++ b/ui/events/event_target.cc
@@ -2,12 +2,12 @@
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
-#include "ui/base/events/event_target.h"
+#include "ui/events/event_target.h"
 
 #include <algorithm>
 
 #include "base/logging.h"
-#include "ui/base/events/event.h"
+#include "ui/events/event.h"
 
 namespace ui {
 
diff --git a/ui/base/events/event_target.h b/ui/events/event_target.h
index 6961b73..b37bff1 100644
--- a/ui/base/events/event_target.h
+++ b/ui/events/event_target.h
@@ -2,13 +2,13 @@
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
-#ifndef UI_BASE_EVENTS_EVENT_TARGET_H_
-#define UI_BASE_EVENTS_EVENT_TARGET_H_
+#ifndef UI_EVENTS_EVENT_TARGET_H_
+#define UI_EVENTS_EVENT_TARGET_H_
 
 #include "base/basictypes.h"
 #include "base/compiler_specific.h"
-#include "ui/base/events/event_handler.h"
 #include "ui/base/ui_export.h"
+#include "ui/events/event_handler.h"
 
 namespace ui {
 
@@ -105,4 +105,4 @@ class UI_EXPORT EventTarget : public EventHandler {
 
 }  // namespace ui
 
-#endif  // UI_BASE_EVENTS_EVENT_TARGET_H_
+#endif  // UI_EVENTS_EVENT_TARGET_H_
diff --git a/ui/base/events/event_unittest.cc b/ui/events/event_unittest.cc
index d55ac92..418c069 100644
--- a/ui/base/events/event_unittest.cc
+++ b/ui/events/event_unittest.cc
@@ -3,7 +3,7 @@
 // found in the LICENSE file.
 
 #include "testing/gtest/include/gtest/gtest.h"
-#include "ui/base/events/event.h"
+#include "ui/events/event.h"
 
 #if defined(USE_X11)
 #include <X11/Xlib.h>
diff --git a/ui/base/events/event_utils.cc b/ui/events/event_utils.cc
index ac09854..5504e4c 100644
--- a/ui/base/events/event_utils.cc
+++ b/ui/events/event_utils.cc
@@ -2,9 +2,9 @@
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
-#include "ui/base/events/event_utils.h"
+#include "ui/events/event_utils.h"
 
-#include "ui/base/events/event.h"
+#include "ui/events/event.h"
 
 namespace ui {
 
diff --git a/ui/base/events/event_utils.h b/ui/events/event_utils.h
index e544221..ed74eb1 100644
--- a/ui/base/events/event_utils.h
+++ b/ui/events/event_utils.h
@@ -2,11 +2,11 @@
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
-#ifndef UI_BASE_EVENTS_EVENT_UTILS_H_
-#define UI_BASE_EVENTS_EVENT_UTILS_H_
+#ifndef UI_EVENTS_EVENT_UTILS_H_
+#define UI_EVENTS_EVENT_UTILS_H_
 
 #include "base/event_types.h"
-#include "ui/base/events/event_constants.h"
+#include "ui/events/event_constants.h"
 #include "ui/events/keycodes/keyboard_codes.h"
 #include "ui/gfx/native_widget_types.h"
 
@@ -150,4 +150,4 @@ UI_EXPORT int RegisterCustomEventType();
 
 }  // namespace ui
 
-#endif  // UI_BASE_EVENTS_EVENT_UTILS_H_
+#endif  // UI_EVENTS_EVENT_UTILS_H_
diff --git a/ui/events/keycodes/keyboard_code_conversion.cc b/ui/events/keycodes/keyboard_code_conversion.cc
index 293790b..a812b51 100644
--- a/ui/events/keycodes/keyboard_code_conversion.cc
+++ b/ui/events/keycodes/keyboard_code_conversion.cc
@@ -4,7 +4,7 @@
 
 #include "ui/events/keycodes/keyboard_code_conversion.h"
 
-#include "ui/base/events/event_constants.h"
+#include "ui/events/event_constants.h"
 
 namespace ui {
 
diff --git a/ui/message_center/views/message_popup_collection_unittest.cc b/ui/message_center/views/message_popup_collection_unittest.cc
index d2b897d..a46a5b6 100644
--- a/ui/message_center/views/message_popup_collection_unittest.cc
+++ b/ui/message_center/views/message_popup_collection_unittest.cc
@@ -10,8 +10,8 @@
 #include "base/strings/string_number_conversions.h"
 #include "base/strings/utf_string_conversions.h"
 #include "testing/gtest/include/gtest/gtest.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/display.h"
 #include "ui/gfx/rect.h"
 #include "ui/message_center/fake_message_center.h"
diff --git a/ui/metro_viewer/metro_viewer_messages.h b/ui/metro_viewer/metro_viewer_messages.h
index 7455262..231bead 100644
--- a/ui/metro_viewer/metro_viewer_messages.h
+++ b/ui/metro_viewer/metro_viewer_messages.h
@@ -8,7 +8,7 @@
 
 #include "base/basictypes.h"
 #include "ipc/ipc_message_macros.h"
-#include "ui/base/events/event_constants.h"
+#include "ui/events/event_constants.h"
 #include "ui/gfx/native_widget_types.h"
 
 #define IPC_MESSAGE_START MetroViewerMsgStart
diff --git a/ui/ui.gyp b/ui/ui.gyp
index 4dd25d4..efe5f7b 100644
--- a/ui/ui.gyp
+++ b/ui/ui.gyp
@@ -163,19 +163,6 @@
         'base/dragdrop/os_exchange_data_provider_aura.h',
         'base/dragdrop/os_exchange_data_provider_win.cc',
         'base/dragdrop/os_exchange_data_provider_win.h',
-        'base/events/event.cc',
-        'base/events/event.h',
-        'base/events/event_constants.h',
-        'base/events/event_conversion_gtk.cc',
-        'base/events/event_conversion_gtk.h',
-        'base/events/event_dispatcher.cc',
-        'base/events/event_dispatcher.h',
-        'base/events/event_handler.cc',
-        'base/events/event_handler.h',
-        'base/events/event_target.cc',
-        'base/events/event_target.h',
-        'base/events/event_utils.cc',
-        'base/events/event_utils.h',
         'base/gestures/gesture_configuration.cc',
         'base/gestures/gesture_configuration.h',
         'base/gestures/gesture_point.cc',
@@ -366,6 +353,19 @@
         'base/x/x11_util.cc',
         'base/x/x11_util.h',
         'base/x/x11_util_internal.h',
+        'events/event.cc',
+        'events/event.h',
+        'events/event_constants.h',
+        'events/event_conversion_gtk.cc',
+        'events/event_conversion_gtk.h',
+        'events/event_dispatcher.cc',
+        'events/event_dispatcher.h',
+        'events/event_handler.cc',
+        'events/event_handler.h',
+        'events/event_target.cc',
+        'events/event_target.h',
+        'events/event_utils.cc',
+        'events/event_utils.h',
         'events/keycodes/keyboard_code_conversion.cc',
         'events/keycodes/keyboard_code_conversion.h',
         'events/keycodes/keyboard_code_conversion_android.cc',
@@ -884,15 +884,15 @@
         }],
         ['toolkit_views==0', {
           'sources!': [
-            'base/events/event.cc',
-            'base/events/event.h',
-            'base/events/event_dispatcher.cc',
-            'base/events/event_dispatcher.h',
-            'base/events/event_handler.cc',
-            'base/events/event_handler.h',
-            'base/events/event_target.cc',
-            'base/events/event_target.h',
             'base/x/events_x.cc',
+            'events/event.cc',
+            'events/event.h',
+            'events/event_dispatcher.cc',
+            'events/event_dispatcher.h',
+            'events/event_handler.cc',
+            'events/event_handler.h',
+            'events/event_target.cc',
+            'events/event_target.h',
           ],
         }],
         ['OS=="android"', {
@@ -902,7 +902,7 @@
             'base/default_theme_provider.cc',
             'base/dragdrop/drag_utils.cc',
             'base/dragdrop/drag_utils.h',
-            'base/events/event_utils.cc',
+            'events/event_utils.cc',
             'events/keycodes/keyboard_code_conversion.cc',
             'base/l10n/l10n_font_util.cc',
             'base/models/button_menu_item_model.cc',
diff --git a/ui/ui_unittests.gypi b/ui/ui_unittests.gypi
index 634bc31..3064c3a 100644
--- a/ui/ui_unittests.gypi
+++ b/ui/ui_unittests.gypi
@@ -153,8 +153,6 @@
         'base/cocoa/nsgraphics_context_additions_unittest.mm',
         'base/cocoa/tracking_area_unittest.mm',
         'base/dragdrop/os_exchange_data_provider_aurax11_unittest.cc',
-        'base/events/event_dispatcher_unittest.cc',
-        'base/events/event_unittest.cc',
         'base/gtk/gtk_expanded_container_unittest.cc',
         'base/gtk/gtk_im_context_util_unittest.cc',
         'base/keycodes/usb_keycode_map_unittest.cc',
@@ -167,6 +165,8 @@
         'base/test/data/resource.h',
         'base/text/bytes_formatting_unittest.cc',
         'base/view_prop_unittest.cc',
+        'events/event_dispatcher_unittest.cc',
+        'events/event_unittest.cc',
         'gfx/blit_unittest.cc',
         'gfx/break_list_unittest.cc',
         'gfx/canvas_unittest.cc',
@@ -314,8 +314,8 @@
           ],
         }, {
           'sources!': [
-            'base/events/event_dispatcher_unittest.cc',
-            'base/events/event_unittest.cc',
+            'events/event_dispatcher_unittest.cc',
+            'events/event_unittest.cc',
           ],
         }],
         ['use_aura==1', {
diff --git a/ui/views/bubble/tray_bubble_view.cc b/ui/views/bubble/tray_bubble_view.cc
index 825c6ce..6192e51 100644
--- a/ui/views/bubble/tray_bubble_view.cc
+++ b/ui/views/bubble/tray_bubble_view.cc
@@ -12,10 +12,10 @@
 #include "third_party/skia/include/core/SkPath.h"
 #include "third_party/skia/include/effects/SkBlurImageFilter.h"
 #include "ui/base/accessibility/accessible_view_state.h"
-#include "ui/base/events/event.h"
 #include "ui/base/l10n/l10n_util.h"
 #include "ui/compositor/layer.h"
 #include "ui/compositor/layer_delegate.h"
+#include "ui/events/event.h"
 #include "ui/gfx/canvas.h"
 #include "ui/gfx/insets.h"
 #include "ui/gfx/path.h"
diff --git a/ui/views/color_chooser/color_chooser_view.cc b/ui/views/color_chooser/color_chooser_view.cc
index da8ae71..c4a136b 100644
--- a/ui/views/color_chooser/color_chooser_view.cc
+++ b/ui/views/color_chooser/color_chooser_view.cc
@@ -8,7 +8,7 @@
 #include "base/strings/string_number_conversions.h"
 #include "base/strings/stringprintf.h"
 #include "base/strings/utf_string_conversions.h"
-#include "ui/base/events/event.h"
+#include "ui/events/event.h"
 #include "ui/events/keycodes/keyboard_codes.h"
 #include "ui/gfx/canvas.h"
 #include "ui/views/background.h"
diff --git a/ui/views/controls/button/custom_button.cc b/ui/views/controls/button/custom_button.cc
index 4dd28da..4a15975 100644
--- a/ui/views/controls/button/custom_button.cc
+++ b/ui/views/controls/button/custom_button.cc
@@ -5,7 +5,7 @@
 #include "ui/views/controls/button/custom_button.h"
 
 #include "ui/base/accessibility/accessible_view_state.h"
-#include "ui/base/events/event.h"
+#include "ui/events/event.h"
 #include "ui/events/keycodes/keyboard_codes.h"
 #include "ui/gfx/animation/throb_animation.h"
 #include "ui/gfx/screen.h"
diff --git a/ui/views/controls/button/custom_button.h b/ui/views/controls/button/custom_button.h
index b818ffd..ecb49f6 100644
--- a/ui/views/controls/button/custom_button.h
+++ b/ui/views/controls/button/custom_button.h
@@ -6,7 +6,7 @@
 #define UI_VIEWS_CONTROLS_BUTTON_CUSTOM_BUTTON_H_
 
 #include "base/memory/scoped_ptr.h"
-#include "ui/base/events/event_constants.h"
+#include "ui/events/event_constants.h"
 #include "ui/gfx/animation/animation_delegate.h"
 #include "ui/views/controls/button/button.h"
 
diff --git a/ui/views/controls/button/menu_button.cc b/ui/views/controls/button/menu_button.cc
index c432676..b2e7037 100644
--- a/ui/views/controls/button/menu_button.cc
+++ b/ui/views/controls/button/menu_button.cc
@@ -9,10 +9,10 @@
 #include "grit/ui_strings.h"
 #include "ui/base/accessibility/accessible_view_state.h"
 #include "ui/base/dragdrop/drag_drop_types.h"
-#include "ui/base/events/event.h"
-#include "ui/base/events/event_constants.h"
 #include "ui/base/l10n/l10n_util.h"
 #include "ui/base/resource/resource_bundle.h"
+#include "ui/events/event.h"
+#include "ui/events/event_constants.h"
 #include "ui/gfx/canvas.h"
 #include "ui/gfx/image/image.h"
 #include "ui/gfx/screen.h"
diff --git a/ui/views/controls/combobox/combobox.cc b/ui/views/controls/combobox/combobox.cc
index cc1911d..8ef7b36 100644
--- a/ui/views/controls/combobox/combobox.cc
+++ b/ui/views/controls/combobox/combobox.cc
@@ -8,9 +8,9 @@
 #include "base/strings/utf_string_conversions.h"
 #include "grit/ui_resources.h"
 #include "ui/base/accessibility/accessible_view_state.h"
-#include "ui/base/events/event.h"
 #include "ui/base/models/combobox_model.h"
 #include "ui/base/resource/resource_bundle.h"
+#include "ui/events/event.h"
 #include "ui/events/keycodes/keyboard_codes.h"
 #include "ui/gfx/canvas.h"
 #include "ui/native_theme/native_theme.h"
diff --git a/ui/views/controls/combobox/combobox_unittest.cc b/ui/views/controls/combobox/combobox_unittest.cc
index 82b7b65..ea8d8f5 100644
--- a/ui/views/controls/combobox/combobox_unittest.cc
+++ b/ui/views/controls/combobox/combobox_unittest.cc
@@ -7,8 +7,8 @@
 #include <set>
 
 #include "base/strings/utf_string_conversions.h"
-#include "ui/base/events/event.h"
 #include "ui/base/models/combobox_model.h"
+#include "ui/events/event.h"
 #include "ui/events/keycodes/keyboard_codes.h"
 #include "ui/views/ime/mock_input_method.h"
 #include "ui/views/test/views_test_base.h"
diff --git a/ui/views/controls/link.cc b/ui/views/controls/link.cc
index ff78d3b..b2bcc8f 100644
--- a/ui/views/controls/link.cc
+++ b/ui/views/controls/link.cc
@@ -9,7 +9,7 @@
 #include "base/logging.h"
 #include "base/strings/utf_string_conversions.h"
 #include "ui/base/accessibility/accessible_view_state.h"
-#include "ui/base/events/event.h"
+#include "ui/events/event.h"
 #include "ui/events/keycodes/keyboard_codes.h"
 #include "ui/gfx/color_utils.h"
 #include "ui/gfx/font.h"
diff --git a/ui/views/controls/menu/menu_controller.cc b/ui/views/controls/menu/menu_controller.cc
index ba53e21..68ff328 100644
--- a/ui/views/controls/menu/menu_controller.cc
+++ b/ui/views/controls/menu/menu_controller.cc
@@ -15,9 +15,9 @@
 #include "base/time/time.h"
 #include "ui/base/dragdrop/drag_utils.h"
 #include "ui/base/dragdrop/os_exchange_data.h"
-#include "ui/base/events/event_constants.h"
-#include "ui/base/events/event_utils.h"
 #include "ui/base/l10n/l10n_util.h"
+#include "ui/events/event_constants.h"
+#include "ui/events/event_utils.h"
 #include "ui/events/keycodes/keyboard_codes.h"
 #include "ui/gfx/canvas.h"
 #include "ui/gfx/native_widget_types.h"
diff --git a/ui/views/controls/menu/menu_controller.h b/ui/views/controls/menu/menu_controller.h
index 3037289..1bd571a 100644
--- a/ui/views/controls/menu/menu_controller.h
+++ b/ui/views/controls/menu/menu_controller.h
@@ -15,7 +15,7 @@
 #include "base/memory/scoped_ptr.h"
 #include "base/message_loop/message_loop.h"
 #include "base/timer/timer.h"
-#include "ui/base/events/event_constants.h"
+#include "ui/events/event_constants.h"
 #include "ui/views/controls/menu/menu_delegate.h"
 #include "ui/views/controls/menu/menu_item_view.h"
 #include "ui/views/widget/widget_observer.h"
diff --git a/ui/views/controls/menu/submenu_view.cc b/ui/views/controls/menu/submenu_view.cc
index fce2983..9184ca9 100644
--- a/ui/views/controls/menu/submenu_view.cc
+++ b/ui/views/controls/menu/submenu_view.cc
@@ -8,7 +8,7 @@
 
 #include "base/compiler_specific.h"
 #include "ui/base/accessibility/accessible_view_state.h"
-#include "ui/base/events/event.h"
+#include "ui/events/event.h"
 #include "ui/gfx/canvas.h"
 #include "ui/views/controls/menu/menu_config.h"
 #include "ui/views/controls/menu/menu_controller.h"
diff --git a/ui/views/controls/scroll_view.cc b/ui/views/controls/scroll_view.cc
index 11ffc02..d835c1e 100644
--- a/ui/views/controls/scroll_view.cc
+++ b/ui/views/controls/scroll_view.cc
@@ -5,7 +5,7 @@
 #include "ui/views/controls/scroll_view.h"
 
 #include "base/logging.h"
-#include "ui/base/events/event.h"
+#include "ui/events/event.h"
 #include "ui/native_theme/native_theme.h"
 #include "ui/views/border.h"
 #include "ui/views/controls/scrollbar/native_scroll_bar.h"
diff --git a/ui/views/controls/scrollbar/base_scroll_bar.cc b/ui/views/controls/scrollbar/base_scroll_bar.cc
index 0d0acca..6271c2e 100644
--- a/ui/views/controls/scrollbar/base_scroll_bar.cc
+++ b/ui/views/controls/scrollbar/base_scroll_bar.cc
@@ -13,8 +13,8 @@
 #include "base/strings/utf_string_conversions.h"
 #include "build/build_config.h"
 #include "grit/ui_strings.h"
-#include "ui/base/events/event.h"
 #include "ui/base/l10n/l10n_util.h"
+#include "ui/events/event.h"
 #include "ui/events/keycodes/keyboard_codes.h"
 #include "ui/gfx/canvas.h"
 #include "ui/views/controls/menu/menu_item_view.h"
diff --git a/ui/views/controls/scrollbar/native_scroll_bar.cc b/ui/views/controls/scrollbar/native_scroll_bar.cc
index de2ec37..9a91370 100644
--- a/ui/views/controls/scrollbar/native_scroll_bar.cc
+++ b/ui/views/controls/scrollbar/native_scroll_bar.cc
@@ -8,7 +8,7 @@
 #include <string>
 
 #include "base/message_loop/message_loop.h"
-#include "ui/base/events/event.h"
+#include "ui/events/event.h"
 #include "ui/views/controls/scrollbar/native_scroll_bar_wrapper.h"
 #include "ui/views/widget/widget.h"
 
diff --git a/ui/views/controls/slider.cc b/ui/views/controls/slider.cc
index a715c96..0a5c7f0 100644
--- a/ui/views/controls/slider.cc
+++ b/ui/views/controls/slider.cc
@@ -13,8 +13,8 @@
 #include "third_party/skia/include/core/SkColor.h"
 #include "third_party/skia/include/core/SkPaint.h"
 #include "ui/base/accessibility/accessible_view_state.h"
-#include "ui/base/events/event.h"
 #include "ui/base/resource/resource_bundle.h"
+#include "ui/events/event.h"
 #include "ui/gfx/animation/slide_animation.h"
 #include "ui/gfx/canvas.h"
 #include "ui/gfx/point.h"
diff --git a/ui/views/controls/table/table_view.cc b/ui/views/controls/table/table_view.cc
index 48dd4c4..c655eb6 100644
--- a/ui/views/controls/table/table_view.cc
+++ b/ui/views/controls/table/table_view.cc
@@ -8,7 +8,7 @@
 
 #include "base/auto_reset.h"
 #include "base/i18n/rtl.h"
-#include "ui/base/events/event.h"
+#include "ui/events/event.h"
 #include "ui/gfx/canvas.h"
 #include "ui/gfx/image/image_skia.h"
 #include "ui/gfx/rect_conversions.h"
diff --git a/ui/views/controls/textfield/native_textfield_views.cc b/ui/views/controls/textfield/native_textfield_views.cc
index 71fbeb4..a184014 100644
--- a/ui/views/controls/textfield/native_textfield_views.cc
+++ b/ui/views/controls/textfield/native_textfield_views.cc
@@ -19,10 +19,10 @@
 #include "ui/base/clipboard/clipboard.h"
 #include "ui/base/dragdrop/drag_drop_types.h"
 #include "ui/base/dragdrop/drag_utils.h"
-#include "ui/base/events/event.h"
 #include "ui/base/l10n/l10n_util.h"
 #include "ui/base/ui_base_switches_util.h"
 #include "ui/compositor/layer.h"
+#include "ui/events/event.h"
 #include "ui/gfx/canvas.h"
 #include "ui/gfx/insets.h"
 #include "ui/gfx/range/range.h"
diff --git a/ui/views/controls/textfield/native_textfield_views.h b/ui/views/controls/textfield/native_textfield_views.h
index dbc52b2..6b1c2de 100644
--- a/ui/views/controls/textfield/native_textfield_views.h
+++ b/ui/views/controls/textfield/native_textfield_views.h
@@ -8,10 +8,10 @@
 #include "base/memory/weak_ptr.h"
 #include "base/strings/string16.h"
 #include "base/timer/timer.h"
-#include "ui/base/events/event_constants.h"
 #include "ui/base/ime/text_input_client.h"
 #include "ui/base/models/simple_menu_model.h"
 #include "ui/base/touch/touch_editing_controller.h"
+#include "ui/events/event_constants.h"
 #include "ui/gfx/font.h"
 #include "ui/views/border.h"
 #include "ui/views/context_menu_controller.h"
diff --git a/ui/views/controls/textfield/native_textfield_views_unittest.cc b/ui/views/controls/textfield/native_textfield_views_unittest.cc
index adfaf8e..54873d9 100644
--- a/ui/views/controls/textfield/native_textfield_views_unittest.cc
+++ b/ui/views/controls/textfield/native_textfield_views_unittest.cc
@@ -22,10 +22,10 @@
 #include "ui/base/clipboard/clipboard.h"
 #include "ui/base/clipboard/scoped_clipboard_writer.h"
 #include "ui/base/dragdrop/drag_drop_types.h"
-#include "ui/base/events/event.h"
 #include "ui/base/ime/text_input_client.h"
 #include "ui/base/l10n/l10n_util.h"
 #include "ui/base/ui_base_switches.h"
+#include "ui/events/event.h"
 #include "ui/events/keycodes/keyboard_codes.h"
 #include "ui/gfx/render_text.h"
 #include "ui/views/controls/textfield/textfield.h"
diff --git a/ui/views/controls/textfield/native_textfield_win.cc b/ui/views/controls/textfield/native_textfield_win.cc
index ccdc312..f98c0ad 100644
--- a/ui/views/controls/textfield/native_textfield_win.cc
+++ b/ui/views/controls/textfield/native_textfield_win.cc
@@ -17,11 +17,11 @@
 #include "ui/base/accessibility/accessible_view_state.h"
 #include "ui/base/clipboard/clipboard.h"
 #include "ui/base/clipboard/scoped_clipboard_writer.h"
-#include "ui/base/events/event.h"
 #include "ui/base/ime/win/tsf_bridge.h"
 #include "ui/base/l10n/l10n_util.h"
 #include "ui/base/l10n/l10n_util_win.h"
 #include "ui/base/win/mouse_wheel_util.h"
+#include "ui/events/event.h"
 #include "ui/events/keycodes/keyboard_codes.h"
 #include "ui/gfx/range/range.h"
 #include "ui/gfx/win/hwnd_util.h"
diff --git a/ui/views/controls/textfield/textfield.cc b/ui/views/controls/textfield/textfield.cc
index 55352e1..b26aa37 100644
--- a/ui/views/controls/textfield/textfield.cc
+++ b/ui/views/controls/textfield/textfield.cc
@@ -10,10 +10,10 @@
 #include "base/strings/string_util.h"
 #include "base/strings/utf_string_conversions.h"
 #include "ui/base/accessibility/accessible_view_state.h"
-#include "ui/base/events/event.h"
 #include "ui/base/ime/text_input_type.h"
 #include "ui/base/resource/resource_bundle.h"
 #include "ui/base/ui_base_switches.h"
+#include "ui/events/event.h"
 #include "ui/events/keycodes/keyboard_codes.h"
 #include "ui/gfx/insets.h"
 #include "ui/gfx/range/range.h"
diff --git a/ui/views/controls/textfield/textfield_controller.cc b/ui/views/controls/textfield/textfield_controller.cc
index d9899d2..8f72be8 100644
--- a/ui/views/controls/textfield/textfield_controller.cc
+++ b/ui/views/controls/textfield/textfield_controller.cc
@@ -5,7 +5,7 @@
 #include "ui/views/controls/textfield/textfield_controller.h"
 
 #include "ui/base/dragdrop/drag_drop_types.h"
-#include "ui/base/events/event.h"
+#include "ui/events/event.h"
 
 namespace views {
 
diff --git a/ui/views/controls/tree/tree_view.cc b/ui/views/controls/tree/tree_view.cc
index 4727b24..78d4693 100644
--- a/ui/views/controls/tree/tree_view.cc
+++ b/ui/views/controls/tree/tree_view.cc
@@ -10,8 +10,8 @@
 #include "base/message_loop/message_loop.h"
 #include "grit/ui_resources.h"
 #include "ui/base/accessibility/accessible_view_state.h"
-#include "ui/base/events/event.h"
 #include "ui/base/resource/resource_bundle.h"
+#include "ui/events/event.h"
 #include "ui/events/keycodes/keyboard_codes.h"
 #include "ui/gfx/canvas.h"
 #include "ui/gfx/image/image.h"
diff --git a/ui/views/controls/webview/unhandled_keyboard_event_handler_aurax11.cc b/ui/views/controls/webview/unhandled_keyboard_event_handler_aurax11.cc
index 41c90ff..7e09af9 100644
--- a/ui/views/controls/webview/unhandled_keyboard_event_handler_aurax11.cc
+++ b/ui/views/controls/webview/unhandled_keyboard_event_handler_aurax11.cc
@@ -6,7 +6,7 @@
 
 #include "base/logging.h"
 #include "content/public/browser/native_web_keyboard_event.h"
-#include "ui/base/events/event.h"
+#include "ui/events/event.h"
 #include "ui/views/focus/focus_manager.h"
 
 using content::NativeWebKeyboardEvent;
diff --git a/ui/views/controls/webview/unhandled_keyboard_event_handler_win.cc b/ui/views/controls/webview/unhandled_keyboard_event_handler_win.cc
index fd82608..b30b557 100644
--- a/ui/views/controls/webview/unhandled_keyboard_event_handler_win.cc
+++ b/ui/views/controls/webview/unhandled_keyboard_event_handler_win.cc
@@ -6,7 +6,7 @@
 
 #include "base/logging.h"
 #include "content/public/browser/native_web_keyboard_event.h"
-#include "ui/base/events/event.h"
+#include "ui/events/event.h"
 #include "ui/views/focus/focus_manager.h"
 
 using content::NativeWebKeyboardEvent;
diff --git a/ui/views/controls/webview/web_dialog_view.cc b/ui/views/controls/webview/web_dialog_view.cc
index 6d72997..ff9d63b 100644
--- a/ui/views/controls/webview/web_dialog_view.cc
+++ b/ui/views/controls/webview/web_dialog_view.cc
@@ -23,7 +23,7 @@
 #include "ui/web_dialogs/web_dialog_ui.h"
 
 #if defined(USE_AURA)
-#include "ui/base/events/event.h"
+#include "ui/events/event.h"
 #include "ui/views/widget/desktop_aura/desktop_native_widget_aura.h"
 #include "ui/views/widget/native_widget_aura.h"
 #endif
diff --git a/ui/views/controls/webview/webview.cc b/ui/views/controls/webview/webview.cc
index 15fed84..9169ac0 100644
--- a/ui/views/controls/webview/webview.cc
+++ b/ui/views/controls/webview/webview.cc
@@ -18,7 +18,7 @@
 #include "ipc/ipc_message.h"
 #include "ui/base/accessibility/accessibility_types.h"
 #include "ui/base/accessibility/accessible_view_state.h"
-#include "ui/base/events/event.h"
+#include "ui/events/event.h"
 #include "ui/views/accessibility/native_view_accessibility.h"
 #include "ui/views/controls/native/native_view_host.h"
 #include "ui/views/focus/focus_manager.h"
diff --git a/ui/views/corewm/capture_controller_unittest.cc b/ui/views/corewm/capture_controller_unittest.cc
index 32a1955..46a8a2e 100644
--- a/ui/views/corewm/capture_controller_unittest.cc
+++ b/ui/views/corewm/capture_controller_unittest.cc
@@ -11,8 +11,8 @@
 #include "ui/aura/test/event_generator.h"
 #include "ui/aura/test/test_screen.h"
 #include "ui/aura/test/test_window_delegate.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/views/test/views_test_base.h"
 #include "ui/views/view.h"
 #include "ui/views/widget/root_view.h"
diff --git a/ui/views/corewm/compound_event_filter.cc b/ui/views/corewm/compound_event_filter.cc
index f1df8b5..1d4387b 100644
--- a/ui/views/corewm/compound_event_filter.cc
+++ b/ui/views/corewm/compound_event_filter.cc
@@ -14,8 +14,8 @@
 #include "ui/aura/root_window.h"
 #include "ui/aura/window_delegate.h"
 #include "ui/aura/window_tracker.h"
-#include "ui/base/events/event.h"
 #include "ui/base/hit_test.h"
+#include "ui/events/event.h"
 
 namespace views {
 namespace corewm {
diff --git a/ui/views/corewm/compound_event_filter.h b/ui/views/corewm/compound_event_filter.h
index e9c927f..15445cd 100644
--- a/ui/views/corewm/compound_event_filter.h
+++ b/ui/views/corewm/compound_event_filter.h
@@ -7,8 +7,8 @@
 
 #include "base/compiler_specific.h"
 #include "base/observer_list.h"
-#include "ui/base/events/event.h"
-#include "ui/base/events/event_handler.h"
+#include "ui/events/event.h"
+#include "ui/events/event_handler.h"
 #include "ui/gfx/native_widget_types.h"
 #include "ui/views/views_export.h"
 
diff --git a/ui/views/corewm/compound_event_filter_unittest.cc b/ui/views/corewm/compound_event_filter_unittest.cc
index 07624c9..a6569e2b 100644
--- a/ui/views/corewm/compound_event_filter_unittest.cc
+++ b/ui/views/corewm/compound_event_filter_unittest.cc
@@ -13,8 +13,8 @@
 #include "ui/aura/test/test_activation_client.h"
 #include "ui/aura/test/test_cursor_client.h"
 #include "ui/aura/test/test_windows.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"
 
 namespace {
 
diff --git a/ui/views/corewm/desktop_capture_controller_unittest.cc b/ui/views/corewm/desktop_capture_controller_unittest.cc
index 830466a..db33a8f 100644
--- a/ui/views/corewm/desktop_capture_controller_unittest.cc
+++ b/ui/views/corewm/desktop_capture_controller_unittest.cc
@@ -8,7 +8,7 @@
 #include "ui/aura/env.h"
 #include "ui/aura/root_window.h"
 #include "ui/aura/test/test_window_delegate.h"
-#include "ui/base/events/event.h"
+#include "ui/events/event.h"
 #include "ui/views/test/views_test_base.h"
 #include "ui/views/view.h"
 #include "ui/views/widget/desktop_aura/desktop_native_widget_aura.h"
diff --git a/ui/views/corewm/focus_controller.cc b/ui/views/corewm/focus_controller.cc
index f985ff4..a5fe9c3 100644
--- a/ui/views/corewm/focus_controller.cc
+++ b/ui/views/corewm/focus_controller.cc
@@ -10,7 +10,7 @@
 #include "ui/aura/client/capture_client.h"
 #include "ui/aura/client/focus_change_observer.h"
 #include "ui/aura/env.h"
-#include "ui/base/events/event.h"
+#include "ui/events/event.h"
 #include "ui/views/corewm/focus_rules.h"
 
 namespace views {
diff --git a/ui/views/corewm/focus_controller_unittest.cc b/ui/views/corewm/focus_controller_unittest.cc
index 55791be..964fd58 100644
--- a/ui/views/corewm/focus_controller_unittest.cc
+++ b/ui/views/corewm/focus_controller_unittest.cc
@@ -18,7 +18,7 @@
 #include "ui/aura/test/test_windows.h"
 #include "ui/aura/window.h"
 #include "ui/aura/window_tracker.h"
-#include "ui/base/events/event_handler.h"
+#include "ui/events/event_handler.h"
 #include "ui/views/corewm/base_focus_rules.h"
 
 namespace views {
diff --git a/ui/views/corewm/input_method_event_filter.cc b/ui/views/corewm/input_method_event_filter.cc
index f8e9647..cfdab6b 100644
--- a/ui/views/corewm/input_method_event_filter.cc
+++ b/ui/views/corewm/input_method_event_filter.cc
@@ -6,9 +6,9 @@
 
 #include "ui/aura/client/aura_constants.h"
 #include "ui/aura/root_window.h"
-#include "ui/base/events/event.h"
 #include "ui/base/ime/input_method.h"
 #include "ui/base/ime/input_method_factory.h"
+#include "ui/events/event.h"
 
 namespace views {
 namespace corewm {
diff --git a/ui/views/corewm/input_method_event_filter.h b/ui/views/corewm/input_method_event_filter.h
index 56ef40e..cb1fae4 100644
--- a/ui/views/corewm/input_method_event_filter.h
+++ b/ui/views/corewm/input_method_event_filter.h
@@ -8,8 +8,8 @@
 #include "base/basictypes.h"
 #include "base/compiler_specific.h"
 #include "base/memory/scoped_ptr.h"
-#include "ui/base/events/event_handler.h"
 #include "ui/base/ime/input_method_delegate.h"
+#include "ui/events/event_handler.h"
 #include "ui/gfx/native_widget_types.h"
 #include "ui/views/views_export.h"
 
diff --git a/ui/views/corewm/tooltip_controller.cc b/ui/views/corewm/tooltip_controller.cc
index 014a92a..2478472 100644
--- a/ui/views/corewm/tooltip_controller.cc
+++ b/ui/views/corewm/tooltip_controller.cc
@@ -15,8 +15,8 @@
 #include "ui/aura/env.h"
 #include "ui/aura/root_window.h"
 #include "ui/aura/window.h"
-#include "ui/base/events/event.h"
 #include "ui/base/resource/resource_bundle.h"
+#include "ui/events/event.h"
 #include "ui/gfx/font.h"
 #include "ui/gfx/point.h"
 #include "ui/gfx/rect.h"
diff --git a/ui/views/corewm/tooltip_controller.h b/ui/views/corewm/tooltip_controller.h
index cc641d0..9cd04d3 100644
--- a/ui/views/corewm/tooltip_controller.h
+++ b/ui/views/corewm/tooltip_controller.h
@@ -12,7 +12,7 @@
 #include "base/timer/timer.h"
 #include "ui/aura/client/tooltip_client.h"
 #include "ui/aura/window_observer.h"
-#include "ui/base/events/event_handler.h"
+#include "ui/events/event_handler.h"
 #include "ui/gfx/point.h"
 #include "ui/gfx/screen_type_delegate.h"
 #include "ui/views/views_export.h"
diff --git a/ui/views/corewm/window_modality_controller.cc b/ui/views/corewm/window_modality_controller.cc
index 6afc7d2..8a3a7ff 100644
--- a/ui/views/corewm/window_modality_controller.cc
+++ b/ui/views/corewm/window_modality_controller.cc
@@ -12,8 +12,8 @@
 #include "ui/aura/root_window.h"
 #include "ui/aura/window.h"
 #include "ui/aura/window_property.h"
-#include "ui/base/events/event.h"
 #include "ui/base/ui_base_types.h"
+#include "ui/events/event.h"
 #include "ui/views/corewm/window_animations.h"
 #include "ui/views/corewm/window_util.h"
 
diff --git a/ui/views/corewm/window_modality_controller.h b/ui/views/corewm/window_modality_controller.h
index 4787a97..07fe308 100644
--- a/ui/views/corewm/window_modality_controller.h
+++ b/ui/views/corewm/window_modality_controller.h
@@ -10,7 +10,7 @@
 #include "base/compiler_specific.h"
 #include "ui/aura/env_observer.h"
 #include "ui/aura/window_observer.h"
-#include "ui/base/events/event_handler.h"
+#include "ui/events/event_handler.h"
 #include "ui/views/views_export.h"
 
 namespace ui {
diff --git a/ui/views/event_utils_aura.cc b/ui/views/event_utils_aura.cc
index 666d47c..455ec1a 100644
--- a/ui/views/event_utils_aura.cc
+++ b/ui/views/event_utils_aura.cc
@@ -8,7 +8,7 @@
 #include "base/memory/scoped_ptr.h"
 #include "ui/aura/client/screen_position_client.h"
 #include "ui/aura/root_window.h"
-#include "ui/base/events/event.h"
+#include "ui/events/event.h"
 #include "ui/gfx/point.h"
 
 using aura::client::ScreenPositionClient;
diff --git a/ui/views/event_utils_win.cc b/ui/views/event_utils_win.cc
index d9417a2e..38c05c9 100644
--- a/ui/views/event_utils_win.cc
+++ b/ui/views/event_utils_win.cc
@@ -7,8 +7,8 @@
 #include <windowsx.h>
 
 #include "base/logging.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/point.h"
 
 namespace views {
diff --git a/ui/views/examples/multiline_example.cc b/ui/views/examples/multiline_example.cc
index 1df08aa..dd8a633 100644
--- a/ui/views/examples/multiline_example.cc
+++ b/ui/views/examples/multiline_example.cc
@@ -5,7 +5,7 @@
 #include "ui/views/examples/multiline_example.h"
 
 #include "base/strings/utf_string_conversions.h"
-#include "ui/base/events/event.h"
+#include "ui/events/event.h"
 #include "ui/gfx/render_text.h"
 #include "ui/views/controls/label.h"
 #include "ui/views/controls/textfield/textfield.h"
diff --git a/ui/views/examples/textfield_example.cc b/ui/views/examples/textfield_example.cc
index 810e17c..ec18cf7 100644
--- a/ui/views/examples/textfield_example.cc
+++ b/ui/views/examples/textfield_example.cc
@@ -5,7 +5,7 @@
 #include "ui/views/examples/textfield_example.h"
 
 #include "base/strings/utf_string_conversions.h"
-#include "ui/base/events/event.h"
+#include "ui/events/event.h"
 #include "ui/gfx/range/range.h"
 #include "ui/gfx/render_text.h"
 #include "ui/views/controls/button/label_button.h"
diff --git a/ui/views/focus/accelerator_handler_win.cc b/ui/views/focus/accelerator_handler_win.cc
index 5ce1aff..ea82dae 100644
--- a/ui/views/focus/accelerator_handler_win.cc
+++ b/ui/views/focus/accelerator_handler_win.cc
@@ -4,7 +4,7 @@
 
 #include "ui/views/focus/accelerator_handler.h"
 
-#include "ui/base/events/event.h"
+#include "ui/events/event.h"
 #include "ui/events/keycodes/keyboard_code_conversion_win.h"
 #include "ui/events/keycodes/keyboard_codes.h"
 #include "ui/views/focus/focus_manager.h"
diff --git a/ui/views/focus/focus_manager.cc b/ui/views/focus/focus_manager.cc
index 1c2adee..429b9ad 100644
--- a/ui/views/focus/focus_manager.cc
+++ b/ui/views/focus/focus_manager.cc
@@ -11,7 +11,7 @@
 #include "base/logging.h"
 #include "build/build_config.h"
 #include "ui/base/accelerators/accelerator.h"
-#include "ui/base/events/event.h"
+#include "ui/events/event.h"
 #include "ui/events/keycodes/keyboard_codes.h"
 #include "ui/views/focus/focus_manager_delegate.h"
 #include "ui/views/focus/focus_search.h"
diff --git a/ui/views/focus/focus_manager_unittest_win.cc b/ui/views/focus/focus_manager_unittest_win.cc
index 2e7ddc0..1309ed2 100644
--- a/ui/views/focus/focus_manager_unittest_win.cc
+++ b/ui/views/focus/focus_manager_unittest_win.cc
@@ -7,7 +7,7 @@
 #include "base/memory/scoped_ptr.h"
 #include "base/run_loop.h"
 #include "base/strings/utf_string_conversions.h"
-#include "ui/base/events/event.h"
+#include "ui/events/event.h"
 #include "ui/views/controls/button/label_button.h"
 #include "ui/views/focus/accelerator_handler.h"
 #include "ui/views/focus/focus_manager_test.h"
diff --git a/ui/views/ime/input_method_base.cc b/ui/views/ime/input_method_base.cc
index 4c4298b..784746b 100644
--- a/ui/views/ime/input_method_base.cc
+++ b/ui/views/ime/input_method_base.cc
@@ -5,8 +5,8 @@
 #include "ui/views/ime/input_method_base.h"
 
 #include "base/logging.h"
-#include "ui/base/events/event.h"
 #include "ui/base/ime/text_input_client.h"
+#include "ui/events/event.h"
 #include "ui/views/view.h"
 #include "ui/views/widget/widget.h"
 
diff --git a/ui/views/ime/input_method_bridge.cc b/ui/views/ime/input_method_bridge.cc
index 8165a60..f0ce73b 100644
--- a/ui/views/ime/input_method_bridge.cc
+++ b/ui/views/ime/input_method_bridge.cc
@@ -4,8 +4,8 @@
 
 #include "ui/views/ime/input_method_bridge.h"
 
-#include "ui/base/events/event.h"
 #include "ui/base/ime/input_method.h"
+#include "ui/events/event.h"
 #include "ui/gfx/rect.h"
 #include "ui/views/view.h"
 #include "ui/views/widget/widget.h"
diff --git a/ui/views/ime/mock_input_method.cc b/ui/views/ime/mock_input_method.cc
index 3bd7168..b04dafb 100644
--- a/ui/views/ime/mock_input_method.cc
+++ b/ui/views/ime/mock_input_method.cc
@@ -6,8 +6,8 @@
 
 #include "base/basictypes.h"
 #include "base/logging.h"
-#include "ui/base/events/event.h"
 #include "ui/base/ime/text_input_client.h"
+#include "ui/events/event.h"
 #include "ui/events/keycodes/keyboard_codes.h"
 #include "ui/views/widget/widget.h"
 
diff --git a/ui/views/mouse_watcher.cc b/ui/views/mouse_watcher.cc
index e4f156f..5a2b4bd 100644
--- a/ui/views/mouse_watcher.cc
+++ b/ui/views/mouse_watcher.cc
@@ -9,8 +9,8 @@
 #include "base/event_types.h"
 #include "base/memory/weak_ptr.h"
 #include "base/message_loop/message_loop.h"
-#include "ui/base/events/event_constants.h"
-#include "ui/base/events/event_utils.h"
+#include "ui/events/event_constants.h"
+#include "ui/events/event_utils.h"
 #include "ui/gfx/screen.h"
 
 namespace views {
diff --git a/ui/views/view.h b/ui/views/view.h
index 0935c51..b0ed0c0 100644
--- a/ui/views/view.h
+++ b/ui/views/view.h
@@ -20,11 +20,11 @@
 #include "ui/base/accessibility/accessibility_types.h"
 #include "ui/base/dragdrop/drag_drop_types.h"
 #include "ui/base/dragdrop/os_exchange_data.h"
-#include "ui/base/events/event.h"
-#include "ui/base/events/event_target.h"
 #include "ui/base/ui_base_types.h"
 #include "ui/compositor/layer_delegate.h"
 #include "ui/compositor/layer_owner.h"
+#include "ui/events/event.h"
+#include "ui/events/event_target.h"
 #include "ui/gfx/native_widget_types.h"
 #include "ui/gfx/rect.h"
 #include "ui/gfx/vector2d.h"
diff --git a/ui/views/view_unittest.cc b/ui/views/view_unittest.cc
index 16e5de6..e0fa07e 100644
--- a/ui/views/view_unittest.cc
+++ b/ui/views/view_unittest.cc
@@ -12,11 +12,11 @@
 #include "testing/gmock/include/gmock/gmock.h"
 #include "ui/base/accelerators/accelerator.h"
 #include "ui/base/clipboard/clipboard.h"
-#include "ui/base/events/event.h"
 #include "ui/base/l10n/l10n_util.h"
 #include "ui/compositor/compositor.h"
 #include "ui/compositor/layer.h"
 #include "ui/compositor/layer_animator.h"
+#include "ui/events/event.h"
 #include "ui/events/keycodes/keyboard_codes.h"
 #include "ui/gfx/canvas.h"
 #include "ui/gfx/path.h"
diff --git a/ui/views/widget/desktop_aura/desktop_drag_drop_client_aurax11.cc b/ui/views/widget/desktop_aura/desktop_drag_drop_client_aurax11.cc
index ee36af3..ffe7853 100644
--- a/ui/views/widget/desktop_aura/desktop_drag_drop_client_aurax11.cc
+++ b/ui/views/widget/desktop_aura/desktop_drag_drop_client_aurax11.cc
@@ -15,9 +15,9 @@
 #include "ui/base/dragdrop/drag_drop_types.h"
 #include "ui/base/dragdrop/os_exchange_data.h"
 #include "ui/base/dragdrop/os_exchange_data_provider_aurax11.h"
-#include "ui/base/events/event.h"
 #include "ui/base/x/selection_utils.h"
 #include "ui/base/x/x11_util.h"
+#include "ui/events/event.h"
 #include "ui/views/widget/desktop_aura/desktop_native_cursor_manager.h"
 
 using aura::client::DragDropDelegate;
diff --git a/ui/views/widget/desktop_aura/desktop_drop_target_win.cc b/ui/views/widget/desktop_aura/desktop_drop_target_win.cc
index 7b92420..c9c7540 100644
--- a/ui/views/widget/desktop_aura/desktop_drop_target_win.cc
+++ b/ui/views/widget/desktop_aura/desktop_drop_target_win.cc
@@ -11,8 +11,8 @@
 #include "ui/aura/root_window.h"
 #include "ui/base/dragdrop/drag_drop_types.h"
 #include "ui/base/dragdrop/os_exchange_data_provider_win.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"
 
 using aura::client::DragDropDelegate;
 using ui::OSExchangeData;
diff --git a/ui/views/widget/desktop_aura/desktop_root_window_host_x11.cc b/ui/views/widget/desktop_aura/desktop_root_window_host_x11.cc
index cf84168..148b563 100644
--- a/ui/views/widget/desktop_aura/desktop_root_window_host_x11.cc
+++ b/ui/views/widget/desktop_aura/desktop_root_window_host_x11.cc
@@ -20,9 +20,9 @@
 #include "ui/aura/root_window.h"
 #include "ui/aura/window_property.h"
 #include "ui/base/dragdrop/os_exchange_data_provider_aurax11.h"
-#include "ui/base/events/event_utils.h"
 #include "ui/base/touch/touch_factory_x11.h"
 #include "ui/base/x/x11_util.h"
+#include "ui/events/event_utils.h"
 #include "ui/gfx/insets.h"
 #include "ui/gfx/path_x11.h"
 #include "ui/native_theme/native_theme.h"
diff --git a/ui/views/widget/desktop_aura/x11_desktop_window_move_client.cc b/ui/views/widget/desktop_aura/x11_desktop_window_move_client.cc
index 73f2cc2d..273372f 100644
--- a/ui/views/widget/desktop_aura/x11_desktop_window_move_client.cc
+++ b/ui/views/widget/desktop_aura/x11_desktop_window_move_client.cc
@@ -14,8 +14,8 @@
 #include "base/run_loop.h"
 #include "ui/aura/env.h"
 #include "ui/aura/root_window.h"
-#include "ui/base/events/event.h"
 #include "ui/base/x/x11_util.h"
+#include "ui/events/event.h"
 #include "ui/gfx/screen.h"
 
 namespace views {
diff --git a/ui/views/widget/desktop_aura/x11_whole_screen_move_loop.cc b/ui/views/widget/desktop_aura/x11_whole_screen_move_loop.cc
index dbc3224..636da43 100644
--- a/ui/views/widget/desktop_aura/x11_whole_screen_move_loop.cc
+++ b/ui/views/widget/desktop_aura/x11_whole_screen_move_loop.cc
@@ -14,8 +14,8 @@
 #include "base/run_loop.h"
 #include "ui/aura/env.h"
 #include "ui/aura/root_window.h"
-#include "ui/base/events/event.h"
 #include "ui/base/x/x11_util.h"
+#include "ui/events/event.h"
 #include "ui/gfx/screen.h"
 
 namespace views {
diff --git a/ui/views/widget/desktop_aura/x11_window_event_filter.cc b/ui/views/widget/desktop_aura/x11_window_event_filter.cc
index 8a3e483..af1dad0 100644
--- a/ui/views/widget/desktop_aura/x11_window_event_filter.cc
+++ b/ui/views/widget/desktop_aura/x11_window_event_filter.cc
@@ -11,10 +11,10 @@
 
 #include "ui/aura/root_window.h"
 #include "ui/aura/window_delegate.h"
-#include "ui/base/events/event.h"
-#include "ui/base/events/event_utils.h"
 #include "ui/base/hit_test.h"
 #include "ui/base/x/x11_util.h"
+#include "ui/events/event.h"
+#include "ui/events/event_utils.h"
 #include "ui/views/widget/native_widget_aura.h"
 
 namespace {
diff --git a/ui/views/widget/desktop_aura/x11_window_event_filter.h b/ui/views/widget/desktop_aura/x11_window_event_filter.h
index 1cf3f9c..a02eab27 100644
--- a/ui/views/widget/desktop_aura/x11_window_event_filter.h
+++ b/ui/views/widget/desktop_aura/x11_window_event_filter.h
@@ -11,8 +11,8 @@
 
 #include "base/compiler_specific.h"
 #include "base/message_loop/message_loop.h"
-#include "ui/base/events/event_handler.h"
 #include "ui/base/x/x11_atom_cache.h"
+#include "ui/events/event_handler.h"
 #include "ui/views/views_export.h"
 
 namespace aura {
diff --git a/ui/views/widget/native_widget_aura.cc b/ui/views/widget/native_widget_aura.cc
index f227e7e..5c5136b 100644
--- a/ui/views/widget/native_widget_aura.cc
+++ b/ui/views/widget/native_widget_aura.cc
@@ -21,9 +21,9 @@
 #include "ui/aura/window.h"
 #include "ui/aura/window_observer.h"
 #include "ui/base/dragdrop/os_exchange_data.h"
-#include "ui/base/events/event.h"
 #include "ui/base/ui_base_types.h"
 #include "ui/compositor/layer.h"
+#include "ui/events/event.h"
 #include "ui/gfx/canvas.h"
 #include "ui/gfx/font.h"
 #include "ui/gfx/screen.h"
diff --git a/ui/views/widget/native_widget_aura.h b/ui/views/widget/native_widget_aura.h
index f5c7328..dfd3aaf 100644
--- a/ui/views/widget/native_widget_aura.h
+++ b/ui/views/widget/native_widget_aura.h
@@ -13,7 +13,7 @@
 #include "ui/aura/client/focus_change_observer.h"
 #include "ui/aura/window_delegate.h"
 #include "ui/base/cursor/cursor.h"
-#include "ui/base/events/event_constants.h"
+#include "ui/events/event_constants.h"
 #include "ui/views/ime/input_method_delegate.h"
 #include "ui/views/views_export.h"
 #include "ui/views/widget/native_widget_private.h"
diff --git a/ui/views/widget/native_widget_aura_unittest.cc b/ui/views/widget/native_widget_aura_unittest.cc
index 612616b..de63a0b 100644
--- a/ui/views/widget/native_widget_aura_unittest.cc
+++ b/ui/views/widget/native_widget_aura_unittest.cc
@@ -15,7 +15,7 @@
 #include "ui/aura/root_window.h"
 #include "ui/aura/test/aura_test_helper.h"
 #include "ui/aura/window.h"
-#include "ui/base/events/event.h"
+#include "ui/events/event.h"
 #include "ui/gfx/screen.h"
 #include "ui/views/layout/fill_layout.h"
 #include "ui/views/widget/root_view.h"
diff --git a/ui/views/widget/native_widget_delegate.h b/ui/views/widget/native_widget_delegate.h
index bc0d974..914b575 100644
--- a/ui/views/widget/native_widget_delegate.h
+++ b/ui/views/widget/native_widget_delegate.h
@@ -7,7 +7,7 @@
 
 #include <vector>
 
-#include "ui/base/events/event_constants.h"
+#include "ui/events/event_constants.h"
 #include "ui/views/views_export.h"
 
 namespace gfx {
diff --git a/ui/views/widget/native_widget_win.cc b/ui/views/widget/native_widget_win.cc
index fa7bd91..53aed93 100644
--- a/ui/views/widget/native_widget_win.cc
+++ b/ui/views/widget/native_widget_win.cc
@@ -18,13 +18,13 @@
 #include "ui/base/dragdrop/drag_source_win.h"
 #include "ui/base/dragdrop/os_exchange_data.h"
 #include "ui/base/dragdrop/os_exchange_data_provider_win.h"
-#include "ui/base/events/event.h"
 #include "ui/base/ime/input_method_factory.h"
 #include "ui/base/l10n/l10n_util_win.h"
 #include "ui/base/theme_provider.h"
 #include "ui/base/view_prop.h"
 #include "ui/base/win/mouse_wheel_util.h"
 #include "ui/base/win/shell.h"
+#include "ui/events/event.h"
 #include "ui/events/keycodes/keyboard_code_conversion_win.h"
 #include "ui/gfx/canvas.h"
 #include "ui/gfx/canvas_skia_paint.h"
diff --git a/ui/views/widget/root_view.cc b/ui/views/widget/root_view.cc
index ed00473..1185c75 100644
--- a/ui/views/widget/root_view.cc
+++ b/ui/views/widget/root_view.cc
@@ -10,8 +10,8 @@
 #include "base/message_loop/message_loop.h"
 #include "ui/base/accessibility/accessible_view_state.h"
 #include "ui/base/dragdrop/drag_drop_types.h"
-#include "ui/base/events/event.h"
 #include "ui/compositor/layer.h"
+#include "ui/events/event.h"
 #include "ui/events/keycodes/keyboard_codes.h"
 #include "ui/gfx/canvas.h"
 #include "ui/views/focus/view_storage.h"
diff --git a/ui/views/widget/root_view.h b/ui/views/widget/root_view.h
index 0b674e9..6ab367b 100644
--- a/ui/views/widget/root_view.h
+++ b/ui/views/widget/root_view.h
@@ -8,7 +8,7 @@
 #include <string>
 
 #include "base/memory/ref_counted.h"
-#include "ui/base/events/event_dispatcher.h"
+#include "ui/events/event_dispatcher.h"
 #include "ui/views/focus/focus_manager.h"
 #include "ui/views/focus/focus_search.h"
 #include "ui/views/view.h"
diff --git a/ui/views/widget/widget.cc b/ui/views/widget/widget.cc
index 35013c6..f485d98 100644
--- a/ui/views/widget/widget.cc
+++ b/ui/views/widget/widget.cc
@@ -9,12 +9,12 @@
 #include "base/message_loop/message_loop.h"
 #include "base/strings/utf_string_conversions.h"
 #include "ui/base/default_theme_provider.h"
-#include "ui/base/events/event.h"
 #include "ui/base/hit_test.h"
 #include "ui/base/l10n/l10n_font_util.h"
 #include "ui/base/resource/resource_bundle.h"
 #include "ui/compositor/compositor.h"
 #include "ui/compositor/layer.h"
+#include "ui/events/event.h"
 #include "ui/gfx/screen.h"
 #include "ui/views/controls/menu/menu_controller.h"
 #include "ui/views/focus/focus_manager.h"
diff --git a/ui/views/widget/widget_unittest.cc b/ui/views/widget/widget_unittest.cc
index fbc9f35..3b8d2ec 100644
--- a/ui/views/widget/widget_unittest.cc
+++ b/ui/views/widget/widget_unittest.cc
@@ -12,7 +12,7 @@
 #include "base/run_loop.h"
 #include "base/strings/utf_string_conversions.h"
 #include "testing/gtest/include/gtest/gtest.h"
-#include "ui/base/events/event_utils.h"
+#include "ui/events/event_utils.h"
 #include "ui/gfx/native_widget_types.h"
 #include "ui/gfx/point.h"
 #include "ui/views/bubble/bubble_delegate.h"
diff --git a/ui/views/win/hwnd_message_handler.cc b/ui/views/win/hwnd_message_handler.cc
index 11fc6d8..66d61ce 100644
--- a/ui/views/win/hwnd_message_handler.cc
+++ b/ui/views/win/hwnd_message_handler.cc
@@ -11,13 +11,13 @@
 #include "base/debug/trace_event.h"
 #include "base/win/win_util.h"
 #include "base/win/windows_version.h"
-#include "ui/base/events/event.h"
-#include "ui/base/events/event_utils.h"
 #include "ui/base/gestures/gesture_sequence.h"
 #include "ui/base/touch/touch_enabled.h"
 #include "ui/base/win/mouse_wheel_util.h"
 #include "ui/base/win/shell.h"
 #include "ui/base/win/touch_input.h"
+#include "ui/events/event.h"
+#include "ui/events/event_utils.h"
 #include "ui/events/keycodes/keyboard_code_conversion_win.h"
 #include "ui/gfx/canvas.h"
 #include "ui/gfx/canvas_skia_paint.h"
diff --git a/ui/views/win/hwnd_message_handler.h b/ui/views/win/hwnd_message_handler.h
index 5ff3ffd..0d31f05 100644
--- a/ui/views/win/hwnd_message_handler.h
+++ b/ui/views/win/hwnd_message_handler.h
@@ -21,7 +21,7 @@
 #include "base/strings/string16.h"
 #include "base/win/win_util.h"
 #include "ui/base/accessibility/accessibility_types.h"
-#include "ui/base/events/event.h"
+#include "ui/events/event.h"
 #include "ui/base/sequential_id_generator.h"
 #include "ui/base/ui_base_types.h"
 #include "ui/gfx/rect.h"
author	sky@chromium.org <sky@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98>	2013-09-18 18:11:54 +0000
committer	sky@chromium.org <sky@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98>	2013-09-18 18:11:54 +0000
commit	86ccbd412375d364cd2e1ea6fabbe696998828fe (patch)
tree	4891f52890bbc3a39983b25229660a4822b1412a /ui
parent	c51461c08853fd38c3eccda1646cfcc3ceff7b06 (diff)
download	chromium_src-86ccbd412375d364cd2e1ea6fabbe696998828fe.zip chromium_src-86ccbd412375d364cd2e1ea6fabbe696998828fe.tar.gz chromium_src-86ccbd412375d364cd2e1ea6fabbe696998828fe.tar.bz2