Moves most files from ui/base/keycodes to ui/events/keycodes

I'm leaving usb_keycodes_map in ui/base for now.

BUG=none
TEST=none
R=ben@chromium.org, benm@chromium.org, scherkus@chromium.org
TBR=benm@chromium.org, brettw@chromium.org, scherkus@chromium.org

Review URL: https://codereview.chromium.org/23480084

git-svn-id: svn://svn.chromium.org/chrome/trunk/src@223739 0039d316-1c4b-4281-b951-d872f2087c98

80 files changed, 129 insertions, 129 deletions

diff --git a/ui/aura/remote_root_window_host_win.cc b/ui/aura/remote_root_window_host_win.cc
index 8122e3d..871df52 100644
--- a/ui/aura/remote_root_window_host_win.cc
+++ b/ui/aura/remote_root_window_host_win.cc
@@ -16,7 +16,7 @@
 #include "ui/aura/root_window.h"
 #include "ui/base/cursor/cursor_loader_win.h"
 #include "ui/base/events/event_utils.h"
-#include "ui/base/keycodes/keyboard_code_conversion_win.h"
+#include "ui/events/keycodes/keyboard_code_conversion_win.h"
 #include "ui/base/view_prop.h"
 #include "ui/gfx/insets.h"
 #include "ui/metro_viewer/metro_viewer_messages.h"
diff --git a/ui/aura/root_window_host_x11.cc b/ui/aura/root_window_host_x11.cc
index 56f311b..8395547 100644
--- a/ui/aura/root_window_host_x11.cc
+++ b/ui/aura/root_window_host_x11.cc
@@ -34,7 +34,6 @@
 #include "ui/base/cursor/cursor.h"
 #include "ui/base/events/event.h"
 #include "ui/base/events/event_utils.h"
-#include "ui/base/keycodes/keyboard_codes.h"
 #include "ui/base/touch/touch_factory_x11.h"
 #include "ui/base/ui_base_switches.h"
 #include "ui/base/view_prop.h"
@@ -42,6 +41,7 @@
 #include "ui/base/x/x11_util.h"
 #include "ui/compositor/dip_util.h"
 #include "ui/compositor/layer.h"
+#include "ui/events/keycodes/keyboard_codes.h"
 #include "ui/gfx/screen.h"
 
 #if defined(OS_CHROMEOS)
diff --git a/ui/aura/root_window_unittest.cc b/ui/aura/root_window_unittest.cc
index f29c926..92930af 100644
--- a/ui/aura/root_window_unittest.cc
+++ b/ui/aura/root_window_unittest.cc
@@ -22,7 +22,7 @@
 #include "ui/base/events/event_utils.h"
 #include "ui/base/gestures/gesture_configuration.h"
 #include "ui/base/hit_test.h"
-#include "ui/base/keycodes/keyboard_codes.h"
+#include "ui/events/keycodes/keyboard_codes.h"
 #include "ui/gfx/point.h"
 #include "ui/gfx/rect.h"
 #include "ui/gfx/screen.h"
diff --git a/ui/aura/test/event_generator.cc b/ui/aura/test/event_generator.cc
index d111220..91bcee7 100644
--- a/ui/aura/test/event_generator.cc
+++ b/ui/aura/test/event_generator.cc
@@ -19,7 +19,7 @@
 #endif
 
 #if defined(OS_WIN)
-#include "ui/base/keycodes/keyboard_code_conversion.h"
+#include "ui/events/keycodes/keyboard_code_conversion.h"
 #endif
 
 namespace aura {
diff --git a/ui/aura/test/event_generator.h b/ui/aura/test/event_generator.h
index 511dd77..36ad695 100644
--- a/ui/aura/test/event_generator.h
+++ b/ui/aura/test/event_generator.h
@@ -12,7 +12,7 @@
 #include "base/callback.h"
 #include "base/memory/scoped_ptr.h"
 #include "ui/base/events/event_constants.h"
-#include "ui/base/keycodes/keyboard_codes.h"
+#include "ui/events/keycodes/keyboard_codes.h"
 #include "ui/gfx/point.h"
 
 namespace base {
diff --git a/ui/aura/test/test_window_delegate.h b/ui/aura/test/test_window_delegate.h
index 3e711f7..44e94c8 100644
--- a/ui/aura/test/test_window_delegate.h
+++ b/ui/aura/test/test_window_delegate.h
@@ -10,7 +10,7 @@
 #include "base/compiler_specific.h"
 #include "third_party/skia/include/core/SkColor.h"
 #include "ui/aura/window_delegate.h"
-#include "ui/base/keycodes/keyboard_codes.h"
+#include "ui/events/keycodes/keyboard_codes.h"
 #include "ui/gfx/rect.h"
 
 namespace aura {
diff --git a/ui/aura/test/ui_controls_factory_aurax11.cc b/ui/aura/test/ui_controls_factory_aurax11.cc
index 5dc8577a..faef340 100644
--- a/ui/aura/test/ui_controls_factory_aurax11.cc
+++ b/ui/aura/test/ui_controls_factory_aurax11.cc
@@ -16,9 +16,9 @@
 #include "ui/aura/env.h"
 #include "ui/aura/root_window.h"
 #include "ui/aura/test/ui_controls_factory_aura.h"
-#include "ui/base/keycodes/keyboard_code_conversion_x.h"
 #include "ui/base/test/ui_controls_aura.h"
 #include "ui/compositor/dip_util.h"
+#include "ui/events/keycodes/keyboard_code_conversion_x.h"
 
 namespace aura {
 namespace test {
diff --git a/ui/aura/window_unittest.cc b/ui/aura/window_unittest.cc
index 4c16f9d..126f358 100644
--- a/ui/aura/window_unittest.cc
+++ b/ui/aura/window_unittest.cc
@@ -31,11 +31,11 @@
 #include "ui/base/events/event_utils.h"
 #include "ui/base/gestures/gesture_configuration.h"
 #include "ui/base/hit_test.h"
-#include "ui/base/keycodes/keyboard_codes.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/keycodes/keyboard_codes.h"
 #include "ui/gfx/canvas.h"
 #include "ui/gfx/screen.h"
 
diff --git a/ui/base/accelerators/accelerator.cc b/ui/base/accelerators/accelerator.cc
index d9560e2..4439af5 100644
--- a/ui/base/accelerators/accelerator.cc
+++ b/ui/base/accelerators/accelerator.cc
@@ -18,7 +18,7 @@
 #include "ui/base/l10n/l10n_util.h"
 
 #if !defined(OS_WIN) && (defined(USE_AURA) || defined(OS_MACOSX))
-#include "ui/base/keycodes/keyboard_code_conversion.h"
+#include "ui/events/keycodes/keyboard_code_conversion.h"
 #endif
 
 namespace ui {
diff --git a/ui/base/accelerators/accelerator.h b/ui/base/accelerators/accelerator.h
index e86538c..c2e2aa6 100644
--- a/ui/base/accelerators/accelerator.h
+++ b/ui/base/accelerators/accelerator.h
@@ -15,8 +15,8 @@
 #include "base/strings/string16.h"
 #include "ui/base/accelerators/platform_accelerator.h"
 #include "ui/base/events/event_constants.h"
-#include "ui/base/keycodes/keyboard_codes.h"
 #include "ui/base/ui_export.h"
+#include "ui/events/keycodes/keyboard_codes.h"
 
 namespace ui {
 
diff --git a/ui/base/accelerators/accelerator_manager_unittest.cc b/ui/base/accelerators/accelerator_manager_unittest.cc
index 73d1a1d..46e0bc1 100644
--- a/ui/base/accelerators/accelerator_manager_unittest.cc
+++ b/ui/base/accelerators/accelerator_manager_unittest.cc
@@ -7,7 +7,7 @@
 #include "base/compiler_specific.h"
 #include "testing/gtest/include/gtest/gtest.h"
 #include "ui/base/events/event_constants.h"
-#include "ui/base/keycodes/keyboard_codes.h"
+#include "ui/events/keycodes/keyboard_codes.h"
 
 namespace ui {
 namespace test {
diff --git a/ui/base/accelerators/platform_accelerator_gtk.cc b/ui/base/accelerators/platform_accelerator_gtk.cc
index cae259b..0e0ad34 100644
--- a/ui/base/accelerators/platform_accelerator_gtk.cc
+++ b/ui/base/accelerators/platform_accelerator_gtk.cc
@@ -5,7 +5,7 @@
 #include "ui/base/accelerators/platform_accelerator_gtk.h"
 
 #include "ui/base/events/event_conversion_gtk.h"
-#include "ui/base/keycodes/keyboard_code_conversion_gtk.h"
+#include "ui/events/keycodes/keyboard_code_conversion_gtk.h"
 
 namespace ui {
 
diff --git a/ui/base/cocoa/events_mac.mm b/ui/base/cocoa/events_mac.mm
index eacfb96..878240d 100644
--- a/ui/base/cocoa/events_mac.mm
+++ b/ui/base/cocoa/events_mac.mm
@@ -10,7 +10,7 @@
 #include "base/logging.h"
 #include "base/time/time.h"
 #include "ui/base/events/event_utils.h"
-#import "ui/base/keycodes/keyboard_code_conversion_mac.h"
+#import "ui/events/keycodes/keyboard_code_conversion_mac.h"
 #include "ui/gfx/point.h"
 
 namespace ui {
diff --git a/ui/base/events/event.cc b/ui/base/events/event.cc
index 663cd25..9fc80d4 100644
--- a/ui/base/events/event.cc
+++ b/ui/base/events/event.cc
@@ -14,14 +14,14 @@
 #include "base/metrics/histogram.h"
 #include "base/strings/stringprintf.h"
 #include "ui/base/events/event_utils.h"
-#include "ui/base/keycodes/keyboard_code_conversion.h"
+#include "ui/events/keycodes/keyboard_code_conversion.h"
 #include "ui/gfx/point3_f.h"
 #include "ui/gfx/point_conversions.h"
 #include "ui/gfx/transform.h"
 #include "ui/gfx/transform_util.h"
 
 #if defined(USE_X11)
-#include "ui/base/keycodes/keyboard_code_conversion_x.h"
+#include "ui/events/keycodes/keyboard_code_conversion_x.h"
 #endif
 
 namespace {
diff --git a/ui/base/events/event.h b/ui/base/events/event.h
index d5e3bb2..d305574 100644
--- a/ui/base/events/event.h
+++ b/ui/base/events/event.h
@@ -13,9 +13,9 @@
 #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/keycodes/keyboard_codes.h"
 #include "ui/base/latency_info.h"
 #include "ui/base/ui_export.h"
+#include "ui/events/keycodes/keyboard_codes.h"
 #include "ui/gfx/point.h"
 
 namespace gfx {
diff --git a/ui/base/events/event_utils.h b/ui/base/events/event_utils.h
index d57ced9..e544221 100644
--- a/ui/base/events/event_utils.h
+++ b/ui/base/events/event_utils.h
@@ -7,7 +7,7 @@
 
 #include "base/event_types.h"
 #include "ui/base/events/event_constants.h"
-#include "ui/base/keycodes/keyboard_codes.h"
+#include "ui/events/keycodes/keyboard_codes.h"
 #include "ui/gfx/native_widget_types.h"
 
 #if defined(OS_WIN)
diff --git a/ui/base/gtk/event_synthesis_gtk.cc b/ui/base/gtk/event_synthesis_gtk.cc
index bd3cb8a..ea56162 100644
--- a/ui/base/gtk/event_synthesis_gtk.cc
+++ b/ui/base/gtk/event_synthesis_gtk.cc
@@ -4,7 +4,7 @@
 
 #include "ui/base/gtk/event_synthesis_gtk.h"
 
-#include "ui/base/keycodes/keyboard_code_conversion_gtk.h"
+#include "ui/events/keycodes/keyboard_code_conversion_gtk.h"
 
 namespace ui {
 
diff --git a/ui/base/gtk/event_synthesis_gtk.h b/ui/base/gtk/event_synthesis_gtk.h
index 50dde0f..1839e29 100644
--- a/ui/base/gtk/event_synthesis_gtk.h
+++ b/ui/base/gtk/event_synthesis_gtk.h
@@ -13,8 +13,8 @@
 #include <gdk/gdkkeysyms.h>
 #include <vector>
 
-#include "ui/base/keycodes/keyboard_codes.h"
 #include "ui/base/ui_export.h"
+#include "ui/events/keycodes/keyboard_codes.h"
 
 namespace ui {
 
diff --git a/ui/base/ime/fake_input_method.cc b/ui/base/ime/fake_input_method.cc
index b643bd8..ff3f5e4cf 100644
--- a/ui/base/ime/fake_input_method.cc
+++ b/ui/base/ime/fake_input_method.cc
@@ -12,13 +12,13 @@
 #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/base/keycodes/keyboard_code_conversion.h"
+#include "ui/events/keycodes/keyboard_code_conversion.h"
 
 #if defined(USE_X11)
 #include <X11/X.h>
 #include <X11/Xlib.h>
 #include <X11/Xutil.h>
-#include "ui/base/keycodes/keyboard_code_conversion_x.h"
+#include "ui/events/keycodes/keyboard_code_conversion_x.h"
 #endif
 
 namespace {
diff --git a/ui/base/ime/input_method.h b/ui/base/ime/input_method.h
index 735b0e9..ac24f77 100644
--- a/ui/base/ime/input_method.h
+++ b/ui/base/ime/input_method.h
@@ -12,8 +12,8 @@
 #include "base/i18n/rtl.h"
 #include "ui/base/ime/text_input_mode.h"
 #include "ui/base/ime/text_input_type.h"
-#include "ui/base/keycodes/keyboard_codes.h"
 #include "ui/base/ui_export.h"
+#include "ui/events/keycodes/keyboard_codes.h"
 
 namespace ui {
 
diff --git a/ui/base/ime/input_method_delegate.h b/ui/base/ime/input_method_delegate.h
index c0846b1..d7e5ea2 100644
--- a/ui/base/ime/input_method_delegate.h
+++ b/ui/base/ime/input_method_delegate.h
@@ -7,8 +7,8 @@
 
 #include "base/event_types.h"
 #include "ui/base/events/event_constants.h"
-#include "ui/base/keycodes/keyboard_codes.h"
 #include "ui/base/ui_export.h"
+#include "ui/events/keycodes/keyboard_codes.h"
 
 namespace ui {
 namespace internal {
diff --git a/ui/base/ime/input_method_ibus.cc b/ui/base/ime/input_method_ibus.cc
index c5bdb0e..f1f0293 100644
--- a/ui/base/ime/input_method_ibus.cc
+++ b/ui/base/ime/input_method_ibus.cc
@@ -30,9 +30,9 @@
 #include "ui/base/events/event_constants.h"
 #include "ui/base/events/event_utils.h"
 #include "ui/base/ime/text_input_client.h"
-#include "ui/base/keycodes/keyboard_code_conversion.h"
-#include "ui/base/keycodes/keyboard_code_conversion_x.h"
-#include "ui/base/keycodes/keyboard_codes.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"
 #include "ui/gfx/rect.h"
 
 namespace {
diff --git a/ui/base/ime/input_method_win.cc b/ui/base/ime/input_method_win.cc
index 3982c22..343a861 100644
--- a/ui/base/ime/input_method_win.cc
+++ b/ui/base/ime/input_method_win.cc
@@ -9,7 +9,7 @@
 #include "ui/base/events/event_constants.h"
 #include "ui/base/events/event_utils.h"
 #include "ui/base/ime/text_input_client.h"
-#include "ui/base/keycodes/keyboard_codes.h"
+#include "ui/events/keycodes/keyboard_codes.h"
 #include "ui/gfx/win/hwnd_util.h"
 
 namespace ui {
diff --git a/ui/base/ozone/evdev/key_event_converter_ozone.cc b/ui/base/ozone/evdev/key_event_converter_ozone.cc
index 8766164..10da4a1 100644
--- a/ui/base/ozone/evdev/key_event_converter_ozone.cc
+++ b/ui/base/ozone/evdev/key_event_converter_ozone.cc
@@ -7,7 +7,7 @@
 #include <linux/input.h>
 
 #include "ui/base/events/event.h"
-#include "ui/base/keycodes/keyboard_codes.h"
+#include "ui/events/keycodes/keyboard_codes.h"
 
 namespace {
 
diff --git a/ui/base/test/ui_controls.h b/ui/base/test/ui_controls.h
index 827c61b..4960d13 100644
--- a/ui/base/test/ui_controls.h
+++ b/ui/base/test/ui_controls.h
@@ -7,7 +7,7 @@
 
 #include "base/callback_forward.h"
 #include "build/build_config.h"
-#include "ui/base/keycodes/keyboard_codes.h"
+#include "ui/events/keycodes/keyboard_codes.h"
 #include "ui/gfx/native_widget_types.h"
 
 namespace ui_controls {
diff --git a/ui/base/test/ui_controls_aura.h b/ui/base/test/ui_controls_aura.h
index d379136..2224944 100644
--- a/ui/base/test/ui_controls_aura.h
+++ b/ui/base/test/ui_controls_aura.h
@@ -6,8 +6,8 @@
 #define UI_TEST_BASE_UI_CONTROLS_AURA_H_
 
 #include "base/callback_forward.h"
-#include "ui/base/keycodes/keyboard_codes.h"
 #include "ui/base/test/ui_controls.h"
+#include "ui/events/keycodes/keyboard_codes.h"
 #include "ui/gfx/native_widget_types.h"
 
 namespace ui_controls {
diff --git a/ui/base/test/ui_controls_internal_win.cc b/ui/base/test/ui_controls_internal_win.cc
index e5110da1..9e8c17c 100644
--- a/ui/base/test/ui_controls_internal_win.cc
+++ b/ui/base/test/ui_controls_internal_win.cc
@@ -9,8 +9,8 @@
 #include "base/logging.h"
 #include "base/memory/ref_counted.h"
 #include "base/message_loop/message_loop.h"
-#include "ui/base/keycodes/keyboard_code_conversion_win.h"
-#include "ui/base/keycodes/keyboard_codes.h"
+#include "ui/events/keycodes/keyboard_code_conversion_win.h"
+#include "ui/events/keycodes/keyboard_codes.h"
 
 #if defined(USE_AURA)
 #include "ui/aura/root_window.h"
diff --git a/ui/base/test/ui_controls_mac.mm b/ui/base/test/ui_controls_mac.mm
index 72f8325..c5e8f75 100644
--- a/ui/base/test/ui_controls_mac.mm
+++ b/ui/base/test/ui_controls_mac.mm
@@ -11,7 +11,7 @@
 #include "base/bind.h"
 #include "base/callback.h"
 #include "base/message_loop/message_loop.h"
-#include "ui/base/keycodes/keyboard_code_conversion_mac.h"
+#include "ui/events/keycodes/keyboard_code_conversion_mac.h"
 
 
 // Implementation details: We use [NSApplication sendEvent:] instead
diff --git a/ui/base/win/events_win.cc b/ui/base/win/events_win.cc
index 6cb6d81..94faf21 100644
--- a/ui/base/win/events_win.cc
+++ b/ui/base/win/events_win.cc
@@ -10,7 +10,7 @@
 #include "base/time/time.h"
 #include "base/win/win_util.h"
 #include "ui/base/events/event_utils.h"
-#include "ui/base/keycodes/keyboard_code_conversion_win.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/x/events_x.cc b/ui/base/x/events_x.cc
index a0fa2e9..d032db1 100644
--- a/ui/base/x/events_x.cc
+++ b/ui/base/x/events_x.cc
@@ -13,12 +13,12 @@
 #include "base/memory/singleton.h"
 #include "base/message_loop/message_pump_x11.h"
 #include "ui/base/events/event_utils.h"
-#include "ui/base/keycodes/keyboard_code_conversion_x.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/keycodes/keyboard_code_conversion_x.h"
 #include "ui/gfx/display.h"
 #include "ui/gfx/point.h"
 #include "ui/gfx/rect.h"
diff --git a/ui/base/x/x11_util.cc b/ui/base/x/x11_util.cc
index a9a1e3a..122b469 100644
--- a/ui/base/x/x11_util.cc
+++ b/ui/base/x/x11_util.cc
@@ -35,11 +35,11 @@
 #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/keycodes/keyboard_code_conversion_x.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/keycodes/keyboard_code_conversion_x.h"
 #include "ui/gfx/canvas.h"
 #include "ui/gfx/image/image_skia.h"
 #include "ui/gfx/image/image_skia_rep.h"
diff --git a/ui/base/x/x11_util.h b/ui/base/x/x11_util.h
index 40eb9c5..5163537 100644
--- a/ui/base/x/x11_util.h
+++ b/ui/base/x/x11_util.h
@@ -18,8 +18,8 @@
 #include "base/event_types.h"
 #include "base/memory/ref_counted_memory.h"
 #include "ui/base/events/event_constants.h"
-#include "ui/base/keycodes/keyboard_codes.h"
 #include "ui/base/ui_export.h"
+#include "ui/events/keycodes/keyboard_codes.h"
 #include "ui/gfx/point.h"
 
 typedef unsigned long Atom;
diff --git a/ui/base/keycodes/keyboard_code_conversion.cc b/ui/events/keycodes/keyboard_code_conversion.cc
index 1a4d92a..293790b 100644
--- a/ui/base/keycodes/keyboard_code_conversion.cc
+++ b/ui/events/keycodes/keyboard_code_conversion.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/keycodes/keyboard_code_conversion.h"
+#include "ui/events/keycodes/keyboard_code_conversion.h"
 
 #include "ui/base/events/event_constants.h"
 
diff --git a/ui/base/keycodes/keyboard_code_conversion.h b/ui/events/keycodes/keyboard_code_conversion.h
index afc7aad..0dd5a12 100644
--- a/ui/base/keycodes/keyboard_code_conversion.h
+++ b/ui/events/keycodes/keyboard_code_conversion.h
@@ -2,12 +2,12 @@
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
-#ifndef UI_BASE_KEYCODES_KEYBOARD_CODE_CONVERSION_H_
-#define UI_BASE_KEYCODES_KEYBOARD_CODE_CONVERSION_H_
+#ifndef UI_EVENTS_KEYCODES_KEYBOARD_CODE_CONVERSION_H_
+#define UI_EVENTS_KEYCODES_KEYBOARD_CODE_CONVERSION_H_
 
 #include "base/basictypes.h"
-#include "ui/base/keycodes/keyboard_codes.h"
 #include "ui/base/ui_export.h"
+#include "ui/events/keycodes/keyboard_codes.h"
 
 namespace ui {
 
@@ -35,4 +35,4 @@ UI_EXPORT uint16 GetCharacterFromKeyCode(KeyboardCode key_code, int flags);
 
 }  // namespace ui
 
-#endif  // UI_BASE_KEYCODES_KEYBOARD_CODE_CONVERSION_H_
+#endif  // UI_EVENTS_KEYCODES_KEYBOARD_CODE_CONVERSION_H_
diff --git a/ui/base/keycodes/keyboard_code_conversion_android.cc b/ui/events/keycodes/keyboard_code_conversion_android.cc
index 42f2cc7..fa0ed31 100644
--- a/ui/base/keycodes/keyboard_code_conversion_android.cc
+++ b/ui/events/keycodes/keyboard_code_conversion_android.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/keycodes/keyboard_code_conversion_android.h"
+#include "ui/events/keycodes/keyboard_code_conversion_android.h"
 
 #include <android/keycodes.h>
 
diff --git a/ui/base/keycodes/keyboard_code_conversion_android.h b/ui/events/keycodes/keyboard_code_conversion_android.h
index 8bf2789..8be44c8 100644
--- a/ui/base/keycodes/keyboard_code_conversion_android.h
+++ b/ui/events/keycodes/keyboard_code_conversion_android.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_KEYCODES_KEYBOARD_CODE_CONVERSION_ANDROID_H_
-#define UI_BASE_KEYCODES_KEYBOARD_CODE_CONVERSION_ANDROID_H_
+#ifndef UI_EVENTS_KEYCODES_KEYBOARD_CODE_CONVERSION_ANDROID_H_
+#define UI_EVENTS_KEYCODES_KEYBOARD_CODE_CONVERSION_ANDROID_H_
 
-#include "ui/base/keycodes/keyboard_codes_posix.h"
 #include "ui/base/ui_export.h"
+#include "ui/events/keycodes/keyboard_codes_posix.h"
 
 namespace ui {
 
@@ -14,4 +14,4 @@ UI_EXPORT KeyboardCode KeyboardCodeFromAndroidKeyCode(int keycode);
 
 }  // namespace ui
 
-#endif  // UI_BASE_KEYCODES_KEYBOARD_CODE_CONVERSION_ANDROID_H_
+#endif  // UI_EVENTS_KEYCODES_KEYBOARD_CODE_CONVERSION_ANDROID_H_
diff --git a/ui/base/keycodes/keyboard_code_conversion_gtk.cc b/ui/events/keycodes/keyboard_code_conversion_gtk.cc
index 0d3fcae..9a39653 100644
--- a/ui/base/keycodes/keyboard_code_conversion_gtk.cc
+++ b/ui/events/keycodes/keyboard_code_conversion_gtk.cc
@@ -33,7 +33,7 @@
 
 // WindowsKeyCodeForGdkKeyCode is copied from platform/gtk/KeyEventGtk.cpp
 
-#include "ui/base/keycodes/keyboard_code_conversion_gtk.h"
+#include "ui/events/keycodes/keyboard_code_conversion_gtk.h"
 
 #include <gdk/gdk.h>
 #include <gdk/gdkkeysyms.h>
@@ -41,8 +41,8 @@
 
 #include "base/basictypes.h"
 #include "build/build_config.h"
-#include "ui/base/keycodes/keyboard_code_conversion_x.h"
-#include "ui/base/keycodes/keyboard_codes_posix.h"
+#include "ui/events/keycodes/keyboard_code_conversion_x.h"
+#include "ui/events/keycodes/keyboard_codes_posix.h"
 
 namespace ui {
 
diff --git a/ui/base/keycodes/keyboard_code_conversion_gtk.h b/ui/events/keycodes/keyboard_code_conversion_gtk.h
index 3593d0c..a01bff7 100644
--- a/ui/base/keycodes/keyboard_code_conversion_gtk.h
+++ b/ui/events/keycodes/keyboard_code_conversion_gtk.h
@@ -33,11 +33,11 @@
 
 // WindowsKeyCodeForGdkKeyCode is copied from platform/gtk/KeyEventGtk.cpp
 
-#ifndef UI_BASE_KEYCODES_KEYBOARD_CODE_CONVERSION_GTK_H_
-#define UI_BASE_KEYCODES_KEYBOARD_CODE_CONVERSION_GTK_H_
+#ifndef UI_EVENTS_KEYCODES_KEYBOARD_CODE_CONVERSION_GTK_H_
+#define UI_EVENTS_KEYCODES_KEYBOARD_CODE_CONVERSION_GTK_H_
 
-#include "ui/base/keycodes/keyboard_codes_posix.h"
 #include "ui/base/ui_export.h"
+#include "ui/events/keycodes/keyboard_codes_posix.h"
 
 typedef struct _GdkEventKey GdkEventKey;
 
@@ -54,4 +54,4 @@ UI_EXPORT int GdkNativeKeyCodeForWindowsKeyCode(KeyboardCode keycode,
 
 } // namespace ui
 
-#endif  // UI_BASE_KEYCODES_KEYBOARD_CODE_CONVERSION_GTK_H_
+#endif  // UI_EVENTS_KEYCODES_KEYBOARD_CODE_CONVERSION_GTK_H_
diff --git a/ui/base/keycodes/keyboard_code_conversion_mac.h b/ui/events/keycodes/keyboard_code_conversion_mac.h
index b0e9779..92e6b13 100644
--- a/ui/base/keycodes/keyboard_code_conversion_mac.h
+++ b/ui/events/keycodes/keyboard_code_conversion_mac.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_KEYCODES_KEYBOARD_CODE_CONVERSION_MAC_H_
-#define UI_BASE_KEYCODES_KEYBOARD_CODE_CONVERSION_MAC_H_
+#ifndef UI_EVENTS_KEYCODES_KEYBOARD_CODE_CONVERSION_MAC_H_
+#define UI_EVENTS_KEYCODES_KEYBOARD_CODE_CONVERSION_MAC_H_
 
 #import <Cocoa/Cocoa.h>
 
 #include "base/basictypes.h"
-#include "ui/base/keycodes/keyboard_codes_posix.h"
 #include "ui/base/ui_export.h"
+#include "ui/events/keycodes/keyboard_codes_posix.h"
 
 namespace ui {
 
@@ -38,4 +38,4 @@ UI_EXPORT KeyboardCode KeyboardCodeFromNSEvent(NSEvent* event);
 
 } // namespace ui
 
-#endif  // UI_BASE_KEYCODES_KEYBOARD_CODE_CONVERSION_MAC_H_
+#endif  // UI_EVENTS_KEYCODES_KEYBOARD_CODE_CONVERSION_MAC_H_
diff --git a/ui/base/keycodes/keyboard_code_conversion_mac.mm b/ui/events/keycodes/keyboard_code_conversion_mac.mm
index 2f8c211..ed50392 100644
--- a/ui/base/keycodes/keyboard_code_conversion_mac.mm
+++ b/ui/events/keycodes/keyboard_code_conversion_mac.mm
@@ -2,7 +2,7 @@
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
-#import "ui/base/keycodes/keyboard_code_conversion_mac.h"
+#import "ui/events/keycodes/keyboard_code_conversion_mac.h"
 
 #include <algorithm>
 
diff --git a/ui/base/keycodes/keyboard_code_conversion_win.cc b/ui/events/keycodes/keyboard_code_conversion_win.cc
index f85cc50..66eeaa7 100644
--- a/ui/base/keycodes/keyboard_code_conversion_win.cc
+++ b/ui/events/keycodes/keyboard_code_conversion_win.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/keycodes/keyboard_code_conversion_win.h"
+#include "ui/events/keycodes/keyboard_code_conversion_win.h"
 
 namespace ui {
 
diff --git a/ui/base/keycodes/keyboard_code_conversion_win.h b/ui/events/keycodes/keyboard_code_conversion_win.h
index 1cf91de..9964138 100644
--- a/ui/base/keycodes/keyboard_code_conversion_win.h
+++ b/ui/events/keycodes/keyboard_code_conversion_win.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_KEYCODES_KEYBOARD_CODE_CONVERSION_WIN_H_
-#define UI_BASE_KEYCODES_KEYBOARD_CODE_CONVERSION_WIN_H_
+#ifndef UI_EVENTS_KEYCODES_KEYBOARD_CODE_CONVERSION_WIN_H_
+#define UI_EVENTS_KEYCODES_KEYBOARD_CODE_CONVERSION_WIN_H_
 
-#include "ui/base/keycodes/keyboard_codes.h"
 #include "ui/base/ui_export.h"
+#include "ui/events/keycodes/keyboard_codes.h"
 
 namespace ui {
 
@@ -16,4 +16,4 @@ UI_EXPORT KeyboardCode KeyboardCodeForWindowsKeyCode(WORD keycode);
 
 }  // namespace ui
 
-#endif  // UI_BASE_KEYCODES_KEYBOARD_CODE_CONVERSION_WIN_H_
+#endif  // UI_EVENTS_KEYCODES_KEYBOARD_CODE_CONVERSION_WIN_H_
diff --git a/ui/base/keycodes/keyboard_code_conversion_x.cc b/ui/events/keycodes/keyboard_code_conversion_x.cc
index a78354f1..8b88e39 100644
--- a/ui/base/keycodes/keyboard_code_conversion_x.cc
+++ b/ui/events/keycodes/keyboard_code_conversion_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/keycodes/keyboard_code_conversion_x.h"
+#include "ui/events/keycodes/keyboard_code_conversion_x.h"
 
 #define XK_3270  // for XK_3270_BackTab
 #include <X11/keysym.h>
diff --git a/ui/base/keycodes/keyboard_code_conversion_x.h b/ui/events/keycodes/keyboard_code_conversion_x.h
index f394de1..8fd1e84 100644
--- a/ui/base/keycodes/keyboard_code_conversion_x.h
+++ b/ui/events/keycodes/keyboard_code_conversion_x.h
@@ -2,12 +2,12 @@
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
-#ifndef UI_BASE_KEYCODES_KEYBOARD_CODE_CONVERSION_X_H_
-#define UI_BASE_KEYCODES_KEYBOARD_CODE_CONVERSION_X_H_
+#ifndef UI_EVENTS_KEYCODES_KEYBOARD_CODE_CONVERSION_X_H_
+#define UI_EVENTS_KEYCODES_KEYBOARD_CODE_CONVERSION_X_H_
 
 #include "base/basictypes.h"
-#include "ui/base/keycodes/keyboard_codes_posix.h"
 #include "ui/base/ui_export.h"
+#include "ui/events/keycodes/keyboard_codes_posix.h"
 
 typedef union _XEvent XEvent;
 
@@ -28,4 +28,4 @@ unsigned int DefaultXKeysymFromHardwareKeycode(unsigned int keycode);
 
 }  // namespace ui
 
-#endif  // UI_BASE_KEYCODES_KEYBOARD_CODE_CONVERSION_X_H_
+#endif  // UI_EVENTS_KEYCODES_KEYBOARD_CODE_CONVERSION_X_H_
diff --git a/ui/base/keycodes/keyboard_codes.h b/ui/events/keycodes/keyboard_codes.h
index 19d6e38..00a7847 100644
--- a/ui/base/keycodes/keyboard_codes.h
+++ b/ui/events/keycodes/keyboard_codes.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_KEYCODES_KEYBOARD_CODES_H_
-#define UI_BASE_KEYCODES_KEYBOARD_CODES_H_
+#ifndef UI_EVENTS_KEYCODES_KEYBOARD_CODES_H_
+#define UI_EVENTS_KEYCODES_KEYBOARD_CODES_H_
 
 #include "build/build_config.h"
 
 #if defined(OS_WIN)
-#include "ui/base/keycodes/keyboard_codes_win.h"
+#include "ui/events/keycodes/keyboard_codes_win.h"
 #elif defined(OS_POSIX)
-#include "ui/base/keycodes/keyboard_codes_posix.h"
+#include "ui/events/keycodes/keyboard_codes_posix.h"
 #endif
 
-#endif  // UI_BASE_KEYCODES_KEYBOARD_CODES_H_
+#endif  // UI_EVENTS_KEYCODES_KEYBOARD_CODES_H_
diff --git a/ui/base/keycodes/keyboard_codes_posix.h b/ui/events/keycodes/keyboard_codes_posix.h
index 5879c99..1f7e06f 100644
--- a/ui/base/keycodes/keyboard_codes_posix.h
+++ b/ui/events/keycodes/keyboard_codes_posix.h
@@ -28,8 +28,8 @@
  * OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
  */
 
-#ifndef UI_BASE_KEYCODES_KEYBOARD_CODES_POSIX_H_
-#define UI_BASE_KEYCODES_KEYBOARD_CODES_POSIX_H_
+#ifndef UI_EVENTS_KEYCODES_KEYBOARD_CODES_POSIX_H_
+#define UI_EVENTS_KEYCODES_KEYBOARD_CODES_POSIX_H_
 
 namespace ui {
 
@@ -225,4 +225,4 @@ enum KeyboardCode {
 
 }  // namespace ui
 
-#endif  // UI_BASE_KEYCODES_KEYBOARD_CODES_POSIX_H_
+#endif  // UI_EVENTS_KEYCODES_KEYBOARD_CODES_POSIX_H_
diff --git a/ui/base/keycodes/keyboard_codes_win.h b/ui/events/keycodes/keyboard_codes_win.h
index fb8ac20..396d38b 100644
--- a/ui/base/keycodes/keyboard_codes_win.h
+++ b/ui/events/keycodes/keyboard_codes_win.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_KEYCODES_KEYBOARD_CODES_WIN_H_
-#define UI_BASE_KEYCODES_KEYBOARD_CODES_WIN_H_
+#ifndef UI_EVENTS_KEYCODES_KEYBOARD_CODES_WIN_H_
+#define UI_EVENTS_KEYCODES_KEYBOARD_CODES_WIN_H_
 
 #include <windows.h>
 #include <ime.h>
@@ -189,4 +189,4 @@ enum KeyboardCode {
 
 }  // namespace ui
 
-#endif  // UI_BASE_KEYCODES_KEYBOARD_CODES_WIN_H_
+#endif  // UI_EVENTS_KEYCODES_KEYBOARD_CODES_WIN_H_
diff --git a/ui/message_center/views/notifier_settings_view.cc b/ui/message_center/views/notifier_settings_view.cc
index d2b363a..42db90c 100644
--- a/ui/message_center/views/notifier_settings_view.cc
+++ b/ui/message_center/views/notifier_settings_view.cc
@@ -13,10 +13,10 @@
 #include "grit/ui_strings.h"
 #include "skia/ext/image_operations.h"
 #include "third_party/skia/include/core/SkColor.h"
-#include "ui/base/keycodes/keyboard_codes.h"
 #include "ui/base/l10n/l10n_util.h"
 #include "ui/base/models/simple_menu_model.h"
 #include "ui/base/resource/resource_bundle.h"
+#include "ui/events/keycodes/keyboard_codes.h"
 #include "ui/gfx/canvas.h"
 #include "ui/gfx/image/image.h"
 #include "ui/gfx/size.h"
diff --git a/ui/ui.gyp b/ui/ui.gyp
index d8c5cc9..4dd25d4 100644
--- a/ui/ui.gyp
+++ b/ui/ui.gyp
@@ -216,19 +216,6 @@
         'base/gtk/scoped_region.cc',
         'base/gtk/scoped_region.h',
         'base/hit_test.h',
-        'base/keycodes/keyboard_code_conversion.cc',
-        'base/keycodes/keyboard_code_conversion.h',
-        'base/keycodes/keyboard_code_conversion_android.cc',
-        'base/keycodes/keyboard_code_conversion_android.h',
-        'base/keycodes/keyboard_code_conversion_gtk.cc',
-        'base/keycodes/keyboard_code_conversion_gtk.h',
-        'base/keycodes/keyboard_code_conversion_mac.h',
-        'base/keycodes/keyboard_code_conversion_mac.mm',
-        'base/keycodes/keyboard_code_conversion_win.cc',
-        'base/keycodes/keyboard_code_conversion_win.h',
-        'base/keycodes/keyboard_code_conversion_x.cc',
-        'base/keycodes/keyboard_code_conversion_x.h',
-        'base/keycodes/keyboard_codes.h',
         'base/keycodes/usb_keycode_map.h',
         'base/latency_info.cc',
         'base/latency_info.h',
@@ -379,6 +366,19 @@
         'base/x/x11_util.cc',
         'base/x/x11_util.h',
         'base/x/x11_util_internal.h',
+        'events/keycodes/keyboard_code_conversion.cc',
+        'events/keycodes/keyboard_code_conversion.h',
+        'events/keycodes/keyboard_code_conversion_android.cc',
+        'events/keycodes/keyboard_code_conversion_android.h',
+        'events/keycodes/keyboard_code_conversion_gtk.cc',
+        'events/keycodes/keyboard_code_conversion_gtk.h',
+        'events/keycodes/keyboard_code_conversion_mac.h',
+        'events/keycodes/keyboard_code_conversion_mac.mm',
+        'events/keycodes/keyboard_code_conversion_win.cc',
+        'events/keycodes/keyboard_code_conversion_win.h',
+        'events/keycodes/keyboard_code_conversion_x.cc',
+        'events/keycodes/keyboard_code_conversion_x.h',
+        'events/keycodes/keyboard_codes.h',
         'gfx/android/device_display_info.cc',
         'gfx/android/device_display_info.h',
         'gfx/android/java_bitmap.cc',
@@ -871,7 +871,7 @@
           ],
         }, {  # use_x11==0
           'sources/': [
-            ['exclude', 'base/keycodes/keyboard_code_conversion_x.*'],
+            ['exclude', 'events/keycodes/keyboard_code_conversion_x.*'],
             ['exclude', 'base/x/*'],
           ],
         }],
@@ -903,7 +903,7 @@
             'base/dragdrop/drag_utils.cc',
             'base/dragdrop/drag_utils.h',
             'base/events/event_utils.cc',
-            'base/keycodes/keyboard_code_conversion.cc',
+            'events/keycodes/keyboard_code_conversion.cc',
             'base/l10n/l10n_font_util.cc',
             'base/models/button_menu_item_model.cc',
             'base/models/dialog_model.cc',
diff --git a/ui/views/color_chooser/color_chooser_view.cc b/ui/views/color_chooser/color_chooser_view.cc
index 07a33a9..da8ae71 100644
--- a/ui/views/color_chooser/color_chooser_view.cc
+++ b/ui/views/color_chooser/color_chooser_view.cc
@@ -9,7 +9,7 @@
 #include "base/strings/stringprintf.h"
 #include "base/strings/utf_string_conversions.h"
 #include "ui/base/events/event.h"
-#include "ui/base/keycodes/keyboard_codes.h"
+#include "ui/events/keycodes/keyboard_codes.h"
 #include "ui/gfx/canvas.h"
 #include "ui/views/background.h"
 #include "ui/views/border.h"
diff --git a/ui/views/controls/button/custom_button.cc b/ui/views/controls/button/custom_button.cc
index 17ea8df..4dd28da 100644
--- a/ui/views/controls/button/custom_button.cc
+++ b/ui/views/controls/button/custom_button.cc
@@ -6,7 +6,7 @@
 
 #include "ui/base/accessibility/accessible_view_state.h"
 #include "ui/base/events/event.h"
-#include "ui/base/keycodes/keyboard_codes.h"
+#include "ui/events/keycodes/keyboard_codes.h"
 #include "ui/gfx/animation/throb_animation.h"
 #include "ui/gfx/screen.h"
 #include "ui/views/widget/widget.h"
diff --git a/ui/views/controls/combobox/combobox.cc b/ui/views/controls/combobox/combobox.cc
index 86aef66..cc1911d 100644
--- a/ui/views/controls/combobox/combobox.cc
+++ b/ui/views/controls/combobox/combobox.cc
@@ -9,9 +9,9 @@
 #include "grit/ui_resources.h"
 #include "ui/base/accessibility/accessible_view_state.h"
 #include "ui/base/events/event.h"
-#include "ui/base/keycodes/keyboard_codes.h"
 #include "ui/base/models/combobox_model.h"
 #include "ui/base/resource/resource_bundle.h"
+#include "ui/events/keycodes/keyboard_codes.h"
 #include "ui/gfx/canvas.h"
 #include "ui/native_theme/native_theme.h"
 #include "ui/views/color_constants.h"
diff --git a/ui/views/controls/combobox/combobox_unittest.cc b/ui/views/controls/combobox/combobox_unittest.cc
index 80bac01..82b7b65 100644
--- a/ui/views/controls/combobox/combobox_unittest.cc
+++ b/ui/views/controls/combobox/combobox_unittest.cc
@@ -8,8 +8,8 @@
 
 #include "base/strings/utf_string_conversions.h"
 #include "ui/base/events/event.h"
-#include "ui/base/keycodes/keyboard_codes.h"
 #include "ui/base/models/combobox_model.h"
+#include "ui/events/keycodes/keyboard_codes.h"
 #include "ui/views/ime/mock_input_method.h"
 #include "ui/views/test/views_test_base.h"
 #include "ui/views/widget/widget.h"
diff --git a/ui/views/controls/link.cc b/ui/views/controls/link.cc
index b82cd51..ff78d3b 100644
--- a/ui/views/controls/link.cc
+++ b/ui/views/controls/link.cc
@@ -10,7 +10,7 @@
 #include "base/strings/utf_string_conversions.h"
 #include "ui/base/accessibility/accessible_view_state.h"
 #include "ui/base/events/event.h"
-#include "ui/base/keycodes/keyboard_codes.h"
+#include "ui/events/keycodes/keyboard_codes.h"
 #include "ui/gfx/color_utils.h"
 #include "ui/gfx/font.h"
 #include "ui/views/controls/link_listener.h"
diff --git a/ui/views/controls/menu/menu_controller.cc b/ui/views/controls/menu/menu_controller.cc
index f261973..ba53e21 100644
--- a/ui/views/controls/menu/menu_controller.cc
+++ b/ui/views/controls/menu/menu_controller.cc
@@ -17,8 +17,8 @@
 #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/keycodes/keyboard_codes.h"
 #include "ui/base/l10n/l10n_util.h"
+#include "ui/events/keycodes/keyboard_codes.h"
 #include "ui/gfx/canvas.h"
 #include "ui/gfx/native_widget_types.h"
 #include "ui/gfx/screen.h"
diff --git a/ui/views/controls/menu/menu_win.cc b/ui/views/controls/menu/menu_win.cc
index d75402b..ac08ec7 100644
--- a/ui/views/controls/menu/menu_win.cc
+++ b/ui/views/controls/menu/menu_win.cc
@@ -10,9 +10,9 @@
 #include "base/stl_util.h"
 #include "base/strings/string_util.h"
 #include "ui/base/accelerators/accelerator.h"
-#include "ui/base/keycodes/keyboard_codes.h"
 #include "ui/base/l10n/l10n_util.h"
 #include "ui/base/l10n/l10n_util_win.h"
+#include "ui/events/keycodes/keyboard_codes.h"
 #include "ui/gfx/canvas.h"
 #include "ui/gfx/font.h"
 #include "ui/gfx/rect.h"
diff --git a/ui/views/controls/menu/native_menu_win.cc b/ui/views/controls/menu/native_menu_win.cc
index 10ff3a3..c48a98c 100644
--- a/ui/views/controls/menu/native_menu_win.cc
+++ b/ui/views/controls/menu/native_menu_win.cc
@@ -13,10 +13,10 @@
 #include "base/strings/string_util.h"
 #include "base/win/wrapped_window_proc.h"
 #include "ui/base/accelerators/accelerator.h"
-#include "ui/base/keycodes/keyboard_codes.h"
 #include "ui/base/l10n/l10n_util.h"
 #include "ui/base/l10n/l10n_util_win.h"
 #include "ui/base/models/menu_model.h"
+#include "ui/events/keycodes/keyboard_codes.h"
 #include "ui/gfx/canvas.h"
 #include "ui/gfx/font.h"
 #include "ui/gfx/image/image.h"
diff --git a/ui/views/controls/native_control.cc b/ui/views/controls/native_control.cc
index e450463..3a1fe58 100644
--- a/ui/views/controls/native_control.cc
+++ b/ui/views/controls/native_control.cc
@@ -13,10 +13,10 @@
 #include "base/logging.h"
 #include "base/memory/scoped_ptr.h"
 #include "ui/base/accessibility/accessibility_types.h"
-#include "ui/base/keycodes/keyboard_code_conversion_win.h"
-#include "ui/base/keycodes/keyboard_codes.h"
 #include "ui/base/l10n/l10n_util_win.h"
 #include "ui/base/view_prop.h"
+#include "ui/events/keycodes/keyboard_code_conversion_win.h"
+#include "ui/events/keycodes/keyboard_codes.h"
 #include "ui/gfx/win/hwnd_util.h"
 #include "ui/views/background.h"
 #include "ui/views/controls/native/native_view_host.h"
diff --git a/ui/views/controls/native_control.h b/ui/views/controls/native_control.h
index 2ec731e..80aa588 100644
--- a/ui/views/controls/native_control.h
+++ b/ui/views/controls/native_control.h
@@ -7,7 +7,7 @@
 
 #include <windows.h>
 
-#include "ui/base/keycodes/keyboard_codes.h"
+#include "ui/events/keycodes/keyboard_codes.h"
 #include "ui/views/view.h"
 
 namespace views {
diff --git a/ui/views/controls/scrollbar/base_scroll_bar.cc b/ui/views/controls/scrollbar/base_scroll_bar.cc
index 38c0256..0d0acca 100644
--- a/ui/views/controls/scrollbar/base_scroll_bar.cc
+++ b/ui/views/controls/scrollbar/base_scroll_bar.cc
@@ -14,8 +14,8 @@
 #include "build/build_config.h"
 #include "grit/ui_strings.h"
 #include "ui/base/events/event.h"
-#include "ui/base/keycodes/keyboard_codes.h"
 #include "ui/base/l10n/l10n_util.h"
+#include "ui/events/keycodes/keyboard_codes.h"
 #include "ui/gfx/canvas.h"
 #include "ui/views/controls/menu/menu_item_view.h"
 #include "ui/views/controls/menu/menu_runner.h"
diff --git a/ui/views/controls/scrollbar/bitmap_scroll_bar.cc b/ui/views/controls/scrollbar/bitmap_scroll_bar.cc
index 7ba82e4..2597cee 100644
--- a/ui/views/controls/scrollbar/bitmap_scroll_bar.cc
+++ b/ui/views/controls/scrollbar/bitmap_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/keycodes/keyboard_codes.h"
 #include "ui/base/l10n/l10n_util.h"
+#include "ui/events/keycodes/keyboard_codes.h"
 #include "ui/gfx/canvas.h"
 #include "ui/gfx/image/image_skia.h"
 #include "ui/views/controls/menu/menu.h"
diff --git a/ui/views/controls/scrollbar/native_scroll_bar_views.cc b/ui/views/controls/scrollbar/native_scroll_bar_views.cc
index aa812a8..6c3506f 100644
--- a/ui/views/controls/scrollbar/native_scroll_bar_views.cc
+++ b/ui/views/controls/scrollbar/native_scroll_bar_views.cc
@@ -5,7 +5,7 @@
 #include "ui/views/controls/scrollbar/native_scroll_bar_views.h"
 
 #include "base/logging.h"
-#include "ui/base/keycodes/keyboard_codes.h"
+#include "ui/events/keycodes/keyboard_codes.h"
 #include "ui/gfx/canvas.h"
 #include "ui/gfx/path.h"
 #include "ui/views/controls/button/custom_button.h"
diff --git a/ui/views/controls/tabbed_pane/tabbed_pane.cc b/ui/views/controls/tabbed_pane/tabbed_pane.cc
index cb2b595..9cf8588 100644
--- a/ui/views/controls/tabbed_pane/tabbed_pane.cc
+++ b/ui/views/controls/tabbed_pane/tabbed_pane.cc
@@ -6,7 +6,7 @@
 
 #include "base/logging.h"
 #include "ui/base/accessibility/accessible_view_state.h"
-#include "ui/base/keycodes/keyboard_codes.h"
+#include "ui/events/keycodes/keyboard_codes.h"
 #include "ui/gfx/canvas.h"
 #include "ui/gfx/font.h"
 #include "ui/views/controls/label.h"
diff --git a/ui/views/controls/table/table_view_observer.h b/ui/views/controls/table/table_view_observer.h
index bd2ff36..44400ee 100644
--- a/ui/views/controls/table/table_view_observer.h
+++ b/ui/views/controls/table/table_view_observer.h
@@ -5,7 +5,7 @@
 #ifndef UI_VIEWS_CONTROLS_TABLE_TABLE_VIEW_OBSERVER_H_
 #define UI_VIEWS_CONTROLS_TABLE_TABLE_VIEW_OBSERVER_H_
 
-#include "ui/base/keycodes/keyboard_codes.h"
+#include "ui/events/keycodes/keyboard_codes.h"
 
 namespace views {
 
diff --git a/ui/views/controls/textfield/native_textfield_views_unittest.cc b/ui/views/controls/textfield/native_textfield_views_unittest.cc
index 9c2b6f2..adfaf8e 100644
--- a/ui/views/controls/textfield/native_textfield_views_unittest.cc
+++ b/ui/views/controls/textfield/native_textfield_views_unittest.cc
@@ -24,9 +24,9 @@
 #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/keycodes/keyboard_codes.h"
 #include "ui/base/l10n/l10n_util.h"
 #include "ui/base/ui_base_switches.h"
+#include "ui/events/keycodes/keyboard_codes.h"
 #include "ui/gfx/render_text.h"
 #include "ui/views/controls/textfield/textfield.h"
 #include "ui/views/controls/textfield/textfield_controller.h"
diff --git a/ui/views/controls/textfield/native_textfield_win.cc b/ui/views/controls/textfield/native_textfield_win.cc
index 1268a69..ccdc312 100644
--- a/ui/views/controls/textfield/native_textfield_win.cc
+++ b/ui/views/controls/textfield/native_textfield_win.cc
@@ -19,10 +19,10 @@
 #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/keycodes/keyboard_codes.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/keycodes/keyboard_codes.h"
 #include "ui/gfx/range/range.h"
 #include "ui/gfx/win/hwnd_util.h"
 #include "ui/native_theme/native_theme_win.h"
diff --git a/ui/views/controls/textfield/textfield.cc b/ui/views/controls/textfield/textfield.cc
index 269bc0f..55352e1 100644
--- a/ui/views/controls/textfield/textfield.cc
+++ b/ui/views/controls/textfield/textfield.cc
@@ -12,9 +12,9 @@
 #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/keycodes/keyboard_codes.h"
 #include "ui/base/resource/resource_bundle.h"
 #include "ui/base/ui_base_switches.h"
+#include "ui/events/keycodes/keyboard_codes.h"
 #include "ui/gfx/insets.h"
 #include "ui/gfx/range/range.h"
 #include "ui/gfx/selection_model.h"
diff --git a/ui/views/controls/textfield/textfield.h b/ui/views/controls/textfield/textfield.h
index 7b5baf3..3f79635 100644
--- a/ui/views/controls/textfield/textfield.h
+++ b/ui/views/controls/textfield/textfield.h
@@ -15,7 +15,7 @@
 #include "build/build_config.h"
 #include "third_party/skia/include/core/SkColor.h"
 #include "ui/base/ime/text_input_type.h"
-#include "ui/base/keycodes/keyboard_codes.h"
+#include "ui/events/keycodes/keyboard_codes.h"
 #include "ui/gfx/font_list.h"
 #include "ui/gfx/native_widget_types.h"
 #include "ui/gfx/text_constants.h"
diff --git a/ui/views/controls/tree/tree_view.cc b/ui/views/controls/tree/tree_view.cc
index 0157902..4727b24 100644
--- a/ui/views/controls/tree/tree_view.cc
+++ b/ui/views/controls/tree/tree_view.cc
@@ -11,8 +11,8 @@
 #include "grit/ui_resources.h"
 #include "ui/base/accessibility/accessible_view_state.h"
 #include "ui/base/events/event.h"
-#include "ui/base/keycodes/keyboard_codes.h"
 #include "ui/base/resource/resource_bundle.h"
+#include "ui/events/keycodes/keyboard_codes.h"
 #include "ui/gfx/canvas.h"
 #include "ui/gfx/image/image.h"
 #include "ui/gfx/rect_conversions.h"
diff --git a/ui/views/controls/tree/tree_view_controller.h b/ui/views/controls/tree/tree_view_controller.h
index 38e7fcc..b1ebf2b 100644
--- a/ui/views/controls/tree/tree_view_controller.h
+++ b/ui/views/controls/tree/tree_view_controller.h
@@ -5,7 +5,7 @@
 #ifndef UI_VIEWS_CONTROLS_TREE_TREE_VIEW_CONTROLLER_H_
 #define UI_VIEWS_CONTROLS_TREE_TREE_VIEW_CONTROLLER_H_
 
-#include "ui/base/keycodes/keyboard_codes.h"
+#include "ui/events/keycodes/keyboard_codes.h"
 #include "ui/views/views_export.h"
 
 namespace ui {
diff --git a/ui/views/controls/webview/web_dialog_view.cc b/ui/views/controls/webview/web_dialog_view.cc
index 1517379..6d72997 100644
--- a/ui/views/controls/webview/web_dialog_view.cc
+++ b/ui/views/controls/webview/web_dialog_view.cc
@@ -14,7 +14,7 @@
 #include "content/public/browser/notification_types.h"
 #include "content/public/browser/render_view_host.h"
 #include "content/public/browser/web_contents.h"
-#include "ui/base/keycodes/keyboard_codes.h"
+#include "ui/events/keycodes/keyboard_codes.h"
 #include "ui/views/controls/webview/webview.h"
 #include "ui/views/layout/fill_layout.h"
 #include "ui/views/widget/root_view.h"
diff --git a/ui/views/focus/accelerator_handler_win.cc b/ui/views/focus/accelerator_handler_win.cc
index 7d11c97..5ce1aff 100644
--- a/ui/views/focus/accelerator_handler_win.cc
+++ b/ui/views/focus/accelerator_handler_win.cc
@@ -5,8 +5,8 @@
 #include "ui/views/focus/accelerator_handler.h"
 
 #include "ui/base/events/event.h"
-#include "ui/base/keycodes/keyboard_code_conversion_win.h"
-#include "ui/base/keycodes/keyboard_codes.h"
+#include "ui/events/keycodes/keyboard_code_conversion_win.h"
+#include "ui/events/keycodes/keyboard_codes.h"
 #include "ui/views/focus/focus_manager.h"
 #include "ui/views/widget/widget.h"
 
diff --git a/ui/views/focus/focus_manager.cc b/ui/views/focus/focus_manager.cc
index 6e2a644..1c2adee 100644
--- a/ui/views/focus/focus_manager.cc
+++ b/ui/views/focus/focus_manager.cc
@@ -12,7 +12,7 @@
 #include "build/build_config.h"
 #include "ui/base/accelerators/accelerator.h"
 #include "ui/base/events/event.h"
-#include "ui/base/keycodes/keyboard_codes.h"
+#include "ui/events/keycodes/keyboard_codes.h"
 #include "ui/views/focus/focus_manager_delegate.h"
 #include "ui/views/focus/focus_search.h"
 #include "ui/views/focus/view_storage.h"
diff --git a/ui/views/focus/focus_manager_unittest.cc b/ui/views/focus/focus_manager_unittest.cc
index 8541f85..a2c9d48 100644
--- a/ui/views/focus/focus_manager_unittest.cc
+++ b/ui/views/focus/focus_manager_unittest.cc
@@ -7,7 +7,7 @@
 
 #include "base/strings/utf_string_conversions.h"
 #include "ui/base/accelerators/accelerator.h"
-#include "ui/base/keycodes/keyboard_codes.h"
+#include "ui/events/keycodes/keyboard_codes.h"
 #include "ui/views/accessible_pane_view.h"
 #include "ui/views/controls/button/label_button.h"
 #include "ui/views/controls/textfield/textfield.h"
diff --git a/ui/views/ime/mock_input_method.cc b/ui/views/ime/mock_input_method.cc
index e48af72..3bd7168 100644
--- a/ui/views/ime/mock_input_method.cc
+++ b/ui/views/ime/mock_input_method.cc
@@ -8,7 +8,7 @@
 #include "base/logging.h"
 #include "ui/base/events/event.h"
 #include "ui/base/ime/text_input_client.h"
-#include "ui/base/keycodes/keyboard_codes.h"
+#include "ui/events/keycodes/keyboard_codes.h"
 #include "ui/views/widget/widget.h"
 
 namespace views {
diff --git a/ui/views/view_unittest.cc b/ui/views/view_unittest.cc
index 6cd2a00..16e5de6 100644
--- a/ui/views/view_unittest.cc
+++ b/ui/views/view_unittest.cc
@@ -13,11 +13,11 @@
 #include "ui/base/accelerators/accelerator.h"
 #include "ui/base/clipboard/clipboard.h"
 #include "ui/base/events/event.h"
-#include "ui/base/keycodes/keyboard_codes.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/keycodes/keyboard_codes.h"
 #include "ui/gfx/canvas.h"
 #include "ui/gfx/path.h"
 #include "ui/gfx/transform.h"
diff --git a/ui/views/widget/native_widget_win.cc b/ui/views/widget/native_widget_win.cc
index 4a3511d..fa7bd91 100644
--- a/ui/views/widget/native_widget_win.cc
+++ b/ui/views/widget/native_widget_win.cc
@@ -20,12 +20,12 @@
 #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/keycodes/keyboard_code_conversion_win.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/keycodes/keyboard_code_conversion_win.h"
 #include "ui/gfx/canvas.h"
 #include "ui/gfx/canvas_skia_paint.h"
 #include "ui/gfx/path.h"
diff --git a/ui/views/widget/root_view.cc b/ui/views/widget/root_view.cc
index ac1cbf2..ed00473 100644
--- a/ui/views/widget/root_view.cc
+++ b/ui/views/widget/root_view.cc
@@ -11,8 +11,8 @@
 #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/keycodes/keyboard_codes.h"
 #include "ui/compositor/layer.h"
+#include "ui/events/keycodes/keyboard_codes.h"
 #include "ui/gfx/canvas.h"
 #include "ui/views/focus/view_storage.h"
 #include "ui/views/layout/fill_layout.h"
diff --git a/ui/views/win/hwnd_message_handler.cc b/ui/views/win/hwnd_message_handler.cc
index dbf6018..11fc6d8 100644
--- a/ui/views/win/hwnd_message_handler.cc
+++ b/ui/views/win/hwnd_message_handler.cc
@@ -14,11 +14,11 @@
 #include "ui/base/events/event.h"
 #include "ui/base/events/event_utils.h"
 #include "ui/base/gestures/gesture_sequence.h"
-#include "ui/base/keycodes/keyboard_code_conversion_win.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/keycodes/keyboard_code_conversion_win.h"
 #include "ui/gfx/canvas.h"
 #include "ui/gfx/canvas_skia_paint.h"
 #include "ui/gfx/icon_util.h"
diff --git a/ui/views/window/dialog_client_view.cc b/ui/views/window/dialog_client_view.cc
index a9b97dd..e03c8a141 100644
--- a/ui/views/window/dialog_client_view.cc
+++ b/ui/views/window/dialog_client_view.cc
@@ -6,7 +6,7 @@
 
 #include <algorithm>
 
-#include "ui/base/keycodes/keyboard_codes.h"
+#include "ui/events/keycodes/keyboard_codes.h"
 #include "ui/views/controls/button/blue_button.h"
 #include "ui/views/controls/button/label_button.h"
 #include "ui/views/layout/layout_constants.h"