summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorsky@chromium.org <sky@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98>2013-09-17 23:31:16 +0000
committersky@chromium.org <sky@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98>2013-09-17 23:31:16 +0000
commit7e9acd08b34f56b7eab5f9d93a8c69c556d5b0c7 (patch)
tree8a309abf13991f5f5998c8071b902100ecb7b199
parentb1d571afd4400219ee44bd15ac9cea7f0ff8e31f (diff)
downloadchromium_src-7e9acd08b34f56b7eab5f9d93a8c69c556d5b0c7.zip
chromium_src-7e9acd08b34f56b7eab5f9d93a8c69c556d5b0c7.tar.gz
chromium_src-7e9acd08b34f56b7eab5f9d93a8c69c556d5b0c7.tar.bz2
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
-rw-r--r--android_webview/tools/third_party_files_whitelist.txt6
-rw-r--r--ash/accelerators/accelerator_controller.cc2
-rw-r--r--ash/accelerators/accelerator_table.h2
-rw-r--r--ash/launcher/launcher_tooltip_manager_unittest.cc2
-rw-r--r--ash/wm/sticky_keys.cc2
-rw-r--r--ash/wm/user_activity_detector_unittest.cc2
-rw-r--r--chrome/browser/apps/web_view_interactive_browsertest.cc2
-rw-r--r--chrome/browser/autofill/autofill_browsertest.cc2
-rw-r--r--chrome/browser/autofill/autofill_interactive_uitest.cc2
-rw-r--r--chrome/browser/automation/automation_provider_win.cc2
-rw-r--r--chrome/browser/automation/testing_automation_provider.cc2
-rw-r--r--chrome/browser/browser_keyevents_browsertest.cc2
-rw-r--r--chrome/browser/chromeos/input_method/input_method_manager_impl_unittest.cc2
-rw-r--r--chrome/browser/chromeos/power/user_activity_notifier.cc2
-rw-r--r--chrome/browser/extensions/extension_host.cc2
-rw-r--r--chrome/browser/password_manager/password_manager_browsertest.cc2
-rw-r--r--chrome/browser/ui/ash/event_rewriter.cc4
-rw-r--r--chrome/browser/ui/ash/event_rewriter.h2
-rw-r--r--chrome/browser/ui/ash/ime_controller_chromeos_unittest.cc2
-rw-r--r--chrome/browser/ui/browser_command_controller.cc2
-rw-r--r--chrome/browser/ui/browser_command_controller_unittest.cc2
-rw-r--r--chrome/browser/ui/cocoa/accelerator_utils_cocoa.mm2
-rw-r--r--chrome/browser/ui/cocoa/web_dialog_window_controller.mm2
-rw-r--r--chrome/browser/ui/find_bar/find_bar_host_browsertest.cc2
-rw-r--r--chrome/browser/ui/gtk/accelerators_gtk.cc2
-rw-r--r--chrome/browser/ui/gtk/browser_window_gtk.cc2
-rw-r--r--chrome/browser/ui/libgtk2ui/gtk2_util.cc2
-rw-r--r--chrome/browser/ui/omnibox/omnibox_view_browsertest.cc2
-rw-r--r--chrome/browser/ui/views/accelerator_table.h2
-rw-r--r--chrome/browser/ui/views/autofill/autofill_popup_view_views.cc2
-rw-r--r--chrome/browser/ui/views/bookmarks/bookmark_bar_view_test.cc2
-rw-r--r--chrome/browser/ui/views/bookmarks/bookmark_bubble_view.cc2
-rw-r--r--chrome/browser/ui/views/desktop_media_picker_views.cc2
-rw-r--r--chrome/browser/ui/views/dropdown_bar_host.cc2
-rw-r--r--chrome/browser/ui/views/dropdown_bar_host_win.cc2
-rw-r--r--chrome/browser/ui/views/find_bar_host.cc2
-rw-r--r--chrome/browser/ui/views/find_bar_host_interactive_uitest.cc2
-rw-r--r--chrome/browser/ui/views/frame/global_menu_bar_x11.cc2
-rw-r--r--chrome/browser/ui/views/fullscreen_exit_bubble_views.cc2
-rw-r--r--chrome/browser/ui/views/javascript_app_modal_dialog_views.cc2
-rw-r--r--chrome/browser/ui/views/keyboard_access_browsertest.cc2
-rw-r--r--chrome/browser/ui/views/omnibox/omnibox_view_win.cc2
-rw-r--r--chrome/browser/ui/views/sync/one_click_signin_bubble_view.cc2
-rw-r--r--chrome/browser/ui/views/tab_contents/render_view_context_menu_views.cc2
-rw-r--r--chrome/renderer/autofill/page_click_tracker_browsertest.cc2
-rw-r--r--chrome/renderer/autofill/password_autofill_agent_browsertest.cc2
-rw-r--r--chrome/renderer/searchbox/searchbox_extension.cc2
-rw-r--r--chrome/test/automation/automation_json_requests.h2
-rw-r--r--chrome/test/automation/tab_proxy.h2
-rw-r--r--chrome/test/base/ui_test_utils.h2
-rw-r--r--chrome/test/chromedriver/chrome/ui_events.h2
-rw-r--r--chrome/test/chromedriver/key_converter.h2
-rw-r--r--chrome/test/chromedriver/keycode_text_conversion.h2
-rw-r--r--chrome/test/chromedriver/keycode_text_conversion_mac.mm2
-rw-r--r--chrome/test/chromedriver/keycode_text_conversion_unittest.cc2
-rw-r--r--chrome/test/chromedriver/keycode_text_conversion_x.cc2
-rw-r--r--chrome/test/reliability/automated_ui_tests.cc2
-rw-r--r--chrome/test/reliability/automated_ui_tests.h2
-rw-r--r--chrome/test/webdriver/keycode_text_conversion.h2
-rw-r--r--chrome/test/webdriver/keycode_text_conversion_gtk.cc2
-rw-r--r--chrome/test/webdriver/keycode_text_conversion_mac.mm2
-rw-r--r--chrome/test/webdriver/keycode_text_conversion_unittest.cc2
-rw-r--r--chrome/test/webdriver/keycode_text_conversion_x.cc2
-rw-r--r--chrome/test/webdriver/webdriver_automation.h2
-rw-r--r--chrome/test/webdriver/webdriver_key_converter.h2
-rw-r--r--components/autofill/content/renderer/autofill_agent.cc2
-rw-r--r--components/autofill/content/renderer/password_autofill_agent.cc2
-rw-r--r--components/autofill/core/browser/password_autofill_manager.cc2
-rw-r--r--content/DEPS1
-rw-r--r--content/browser/browser_plugin/browser_plugin_guest.cc2
-rw-r--r--content/browser/browser_plugin/browser_plugin_guest_manager.cc2
-rw-r--r--content/browser/renderer_host/input/immediate_input_router.cc2
-rw-r--r--content/browser/renderer_host/input/immediate_input_router_unittest.cc2
-rw-r--r--content/browser/renderer_host/input/input_router_unittest.cc2
-rw-r--r--content/browser/renderer_host/input/web_input_event_builders_android.cc4
-rw-r--r--content/browser/renderer_host/input/web_input_event_builders_gtk.cc2
-rw-r--r--content/browser/renderer_host/input/web_input_event_builders_gtk.h2
-rw-r--r--content/browser/renderer_host/input/web_input_event_builders_gtk_unittest.cc2
-rw-r--r--content/browser/renderer_host/input/web_input_event_util.h2
-rw-r--r--content/browser/renderer_host/input/web_input_event_util_posix.h2
-rw-r--r--content/browser/renderer_host/render_widget_host_impl.cc2
-rw-r--r--content/browser/renderer_host/render_widget_host_unittest.cc2
-rw-r--r--content/browser/renderer_host/render_widget_host_view_mac.mm2
-rw-r--r--content/browser/renderer_host/web_input_event_aurax11.cc4
-rw-r--r--content/public/test/browser_test_utils.h2
-rw-r--r--content/renderer/browser_plugin/browser_plugin.cc2
-rw-r--r--content/renderer/render_view_browsertest.cc4
-rw-r--r--media/DEPS1
-rw-r--r--media/base/keyboard_event_counter.h2
-rw-r--r--media/base/user_input_monitor_linux.cc2
-rw-r--r--media/base/user_input_monitor_win.cc2
-rw-r--r--ppapi/examples/ime/ime.cc2
-rw-r--r--remoting/client/jni/android_keymap.cc2
-rw-r--r--ui/aura/remote_root_window_host_win.cc2
-rw-r--r--ui/aura/root_window_host_x11.cc2
-rw-r--r--ui/aura/root_window_unittest.cc2
-rw-r--r--ui/aura/test/event_generator.cc2
-rw-r--r--ui/aura/test/event_generator.h2
-rw-r--r--ui/aura/test/test_window_delegate.h2
-rw-r--r--ui/aura/test/ui_controls_factory_aurax11.cc2
-rw-r--r--ui/aura/window_unittest.cc2
-rw-r--r--ui/base/accelerators/accelerator.cc2
-rw-r--r--ui/base/accelerators/accelerator.h2
-rw-r--r--ui/base/accelerators/accelerator_manager_unittest.cc2
-rw-r--r--ui/base/accelerators/platform_accelerator_gtk.cc2
-rw-r--r--ui/base/cocoa/events_mac.mm2
-rw-r--r--ui/base/events/event.cc4
-rw-r--r--ui/base/events/event.h2
-rw-r--r--ui/base/events/event_utils.h2
-rw-r--r--ui/base/gtk/event_synthesis_gtk.cc2
-rw-r--r--ui/base/gtk/event_synthesis_gtk.h2
-rw-r--r--ui/base/ime/fake_input_method.cc4
-rw-r--r--ui/base/ime/input_method.h2
-rw-r--r--ui/base/ime/input_method_delegate.h2
-rw-r--r--ui/base/ime/input_method_ibus.cc6
-rw-r--r--ui/base/ime/input_method_win.cc2
-rw-r--r--ui/base/ozone/evdev/key_event_converter_ozone.cc2
-rw-r--r--ui/base/test/ui_controls.h2
-rw-r--r--ui/base/test/ui_controls_aura.h2
-rw-r--r--ui/base/test/ui_controls_internal_win.cc4
-rw-r--r--ui/base/test/ui_controls_mac.mm2
-rw-r--r--ui/base/win/events_win.cc2
-rw-r--r--ui/base/x/events_x.cc2
-rw-r--r--ui/base/x/x11_util.cc2
-rw-r--r--ui/base/x/x11_util.h2
-rw-r--r--ui/events/keycodes/keyboard_code_conversion.cc (renamed from ui/base/keycodes/keyboard_code_conversion.cc)2
-rw-r--r--ui/events/keycodes/keyboard_code_conversion.h (renamed from ui/base/keycodes/keyboard_code_conversion.h)8
-rw-r--r--ui/events/keycodes/keyboard_code_conversion_android.cc (renamed from ui/base/keycodes/keyboard_code_conversion_android.cc)2
-rw-r--r--ui/events/keycodes/keyboard_code_conversion_android.h (renamed from ui/base/keycodes/keyboard_code_conversion_android.h)8
-rw-r--r--ui/events/keycodes/keyboard_code_conversion_gtk.cc (renamed from ui/base/keycodes/keyboard_code_conversion_gtk.cc)6
-rw-r--r--ui/events/keycodes/keyboard_code_conversion_gtk.h (renamed from ui/base/keycodes/keyboard_code_conversion_gtk.h)8
-rw-r--r--ui/events/keycodes/keyboard_code_conversion_mac.h (renamed from ui/base/keycodes/keyboard_code_conversion_mac.h)8
-rw-r--r--ui/events/keycodes/keyboard_code_conversion_mac.mm (renamed from ui/base/keycodes/keyboard_code_conversion_mac.mm)2
-rw-r--r--ui/events/keycodes/keyboard_code_conversion_win.cc (renamed from ui/base/keycodes/keyboard_code_conversion_win.cc)2
-rw-r--r--ui/events/keycodes/keyboard_code_conversion_win.h (renamed from ui/base/keycodes/keyboard_code_conversion_win.h)8
-rw-r--r--ui/events/keycodes/keyboard_code_conversion_x.cc (renamed from ui/base/keycodes/keyboard_code_conversion_x.cc)2
-rw-r--r--ui/events/keycodes/keyboard_code_conversion_x.h (renamed from ui/base/keycodes/keyboard_code_conversion_x.h)8
-rw-r--r--ui/events/keycodes/keyboard_codes.h (renamed from ui/base/keycodes/keyboard_codes.h)10
-rw-r--r--ui/events/keycodes/keyboard_codes_posix.h (renamed from ui/base/keycodes/keyboard_codes_posix.h)6
-rw-r--r--ui/events/keycodes/keyboard_codes_win.h (renamed from ui/base/keycodes/keyboard_codes_win.h)6
-rw-r--r--ui/message_center/views/notifier_settings_view.cc2
-rw-r--r--ui/ui.gyp30
-rw-r--r--ui/views/color_chooser/color_chooser_view.cc2
-rw-r--r--ui/views/controls/button/custom_button.cc2
-rw-r--r--ui/views/controls/combobox/combobox.cc2
-rw-r--r--ui/views/controls/combobox/combobox_unittest.cc2
-rw-r--r--ui/views/controls/link.cc2
-rw-r--r--ui/views/controls/menu/menu_controller.cc2
-rw-r--r--ui/views/controls/menu/menu_win.cc2
-rw-r--r--ui/views/controls/menu/native_menu_win.cc2
-rw-r--r--ui/views/controls/native_control.cc4
-rw-r--r--ui/views/controls/native_control.h2
-rw-r--r--ui/views/controls/scrollbar/base_scroll_bar.cc2
-rw-r--r--ui/views/controls/scrollbar/bitmap_scroll_bar.cc2
-rw-r--r--ui/views/controls/scrollbar/native_scroll_bar_views.cc2
-rw-r--r--ui/views/controls/tabbed_pane/tabbed_pane.cc2
-rw-r--r--ui/views/controls/table/table_view_observer.h2
-rw-r--r--ui/views/controls/textfield/native_textfield_views_unittest.cc2
-rw-r--r--ui/views/controls/textfield/native_textfield_win.cc2
-rw-r--r--ui/views/controls/textfield/textfield.cc2
-rw-r--r--ui/views/controls/textfield/textfield.h2
-rw-r--r--ui/views/controls/tree/tree_view.cc2
-rw-r--r--ui/views/controls/tree/tree_view_controller.h2
-rw-r--r--ui/views/controls/webview/web_dialog_view.cc2
-rw-r--r--ui/views/focus/accelerator_handler_win.cc4
-rw-r--r--ui/views/focus/focus_manager.cc2
-rw-r--r--ui/views/focus/focus_manager_unittest.cc2
-rw-r--r--ui/views/ime/mock_input_method.cc2
-rw-r--r--ui/views/view_unittest.cc2
-rw-r--r--ui/views/widget/native_widget_win.cc2
-rw-r--r--ui/views/widget/root_view.cc2
-rw-r--r--ui/views/win/hwnd_message_handler.cc2
-rw-r--r--ui/views/window/dialog_client_view.cc2
173 files changed, 228 insertions, 226 deletions
diff --git a/android_webview/tools/third_party_files_whitelist.txt b/android_webview/tools/third_party_files_whitelist.txt
index 60b6542..a1cb33a 100644
--- a/android_webview/tools/third_party_files_whitelist.txt
+++ b/android_webview/tools/third_party_files_whitelist.txt
@@ -161,14 +161,14 @@ ui/base/clipboard/clipboard_util_win.cc
ui/base/dragdrop/os_exchange_data_provider_win.cc
# Copyright The Chromium Authors, Apple Inc, Michael Emmel, Holger Hans Peter
# Freyther, Collabora Ltd, Google Inc; BSD license. Not used on Android.
-ui/base/keycodes/keyboard_code_conversion_gtk.cc
+ui/events/keycodes/keyboard_code_conversion_gtk.cc
# Copyright The Chromium Authors, Apple Inc, Michael Emmel, Holger Hans Peter
# Freyther, Collabora Ltd, Google Inc; BSD license. Not used on Android.
-ui/base/keycodes/keyboard_code_conversion_gtk.h
+ui/events/keycodes/keyboard_code_conversion_gtk.h
# Copyright The Chromium Authors, Michael Emmel, Google Inc; BSD license. This
# third-party code is taken from WebKit, the license for which we already pick
# up from webkit/.
-ui/base/keycodes/keyboard_codes_posix.h
+ui/events/keycodes/keyboard_codes_posix.h
# This third-party code is taken from Mozilla, but is copyright Google and has
# been re-licensed under the Chromium license.
ui/gfx/codec/jpeg_codec.cc
diff --git a/ash/accelerators/accelerator_controller.cc b/ash/accelerators/accelerator_controller.cc
index b07859c..32d627f 100644
--- a/ash/accelerators/accelerator_controller.cc
+++ b/ash/accelerators/accelerator_controller.cc
@@ -57,11 +57,11 @@
#include "ui/base/accelerators/accelerator.h"
#include "ui/base/accelerators/accelerator_manager.h"
#include "ui/base/events/event.h"
-#include "ui/base/keycodes/keyboard_codes.h"
#include "ui/compositor/debug_utils.h"
#include "ui/compositor/layer.h"
#include "ui/compositor/layer_animation_sequence.h"
#include "ui/compositor/layer_animator.h"
+#include "ui/events/keycodes/keyboard_codes.h"
#include "ui/gfx/screen.h"
#include "ui/oak/oak.h"
#include "ui/views/controls/webview/webview.h"
diff --git a/ash/accelerators/accelerator_table.h b/ash/accelerators/accelerator_table.h
index 6136c9e..6de8125 100644
--- a/ash/accelerators/accelerator_table.h
+++ b/ash/accelerators/accelerator_table.h
@@ -8,7 +8,7 @@
#include "ash/ash_export.h"
#include "base/basictypes.h"
#include "ui/base/events/event_constants.h"
-#include "ui/base/keycodes/keyboard_codes.h"
+#include "ui/events/keycodes/keyboard_codes.h"
namespace ash {
diff --git a/ash/launcher/launcher_tooltip_manager_unittest.cc b/ash/launcher/launcher_tooltip_manager_unittest.cc
index d81b4c7..be07208 100644
--- a/ash/launcher/launcher_tooltip_manager_unittest.cc
+++ b/ash/launcher/launcher_tooltip_manager_unittest.cc
@@ -18,7 +18,7 @@
#include "ui/base/events/event.h"
#include "ui/base/events/event_constants.h"
#include "ui/base/events/event_handler.h"
-#include "ui/base/keycodes/keyboard_codes.h"
+#include "ui/events/keycodes/keyboard_codes.h"
#include "ui/views/widget/widget.h"
namespace {
diff --git a/ash/wm/sticky_keys.cc b/ash/wm/sticky_keys.cc
index 55c5c9b..dd2c75a 100644
--- a/ash/wm/sticky_keys.cc
+++ b/ash/wm/sticky_keys.cc
@@ -11,7 +11,7 @@
#include "base/debug/stack_trace.h"
#include "ui/aura/root_window.h"
#include "ui/base/events/event.h"
-#include "ui/base/keycodes/keyboard_code_conversion.h"
+#include "ui/events/keycodes/keyboard_code_conversion.h"
namespace ash {
diff --git a/ash/wm/user_activity_detector_unittest.cc b/ash/wm/user_activity_detector_unittest.cc
index 271d764..6c58200 100644
--- a/ash/wm/user_activity_detector_unittest.cc
+++ b/ash/wm/user_activity_detector_unittest.cc
@@ -14,7 +14,7 @@
#include "ui/aura/window.h"
#include "ui/base/events/event.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 {
diff --git a/chrome/browser/apps/web_view_interactive_browsertest.cc b/chrome/browser/apps/web_view_interactive_browsertest.cc
index f42912c..40d9c2a 100644
--- a/chrome/browser/apps/web_view_interactive_browsertest.cc
+++ b/chrome/browser/apps/web_view_interactive_browsertest.cc
@@ -21,8 +21,8 @@
#include "content/public/common/content_switches.h"
#include "content/public/test/browser_test_utils.h"
#include "net/test/embedded_test_server/embedded_test_server.h"
-#include "ui/base/keycodes/keyboard_codes.h"
#include "ui/base/test/ui_controls.h"
+#include "ui/events/keycodes/keyboard_codes.h"
using apps::ShellWindow;
diff --git a/chrome/browser/autofill/autofill_browsertest.cc b/chrome/browser/autofill/autofill_browsertest.cc
index 7ec9fd8..5456f25 100644
--- a/chrome/browser/autofill/autofill_browsertest.cc
+++ b/chrome/browser/autofill/autofill_browsertest.cc
@@ -46,7 +46,7 @@
#include "net/url_request/test_url_fetcher_factory.h"
#include "testing/gmock/include/gmock/gmock.h"
#include "testing/gtest/include/gtest/gtest.h"
-#include "ui/base/keycodes/keyboard_codes.h"
+#include "ui/events/keycodes/keyboard_codes.h"
namespace autofill {
diff --git a/chrome/browser/autofill/autofill_interactive_uitest.cc b/chrome/browser/autofill/autofill_interactive_uitest.cc
index 2758ecd..3ef1177 100644
--- a/chrome/browser/autofill/autofill_interactive_uitest.cc
+++ b/chrome/browser/autofill/autofill_interactive_uitest.cc
@@ -50,7 +50,7 @@
#include "net/url_request/test_url_fetcher_factory.h"
#include "testing/gmock/include/gmock/gmock.h"
#include "testing/gtest/include/gtest/gtest.h"
-#include "ui/base/keycodes/keyboard_codes.h"
+#include "ui/events/keycodes/keyboard_codes.h"
namespace autofill {
diff --git a/chrome/browser/automation/automation_provider_win.cc b/chrome/browser/automation/automation_provider_win.cc
index 6fcf09b..aabf491 100644
--- a/chrome/browser/automation/automation_provider_win.cc
+++ b/chrome/browser/automation/automation_provider_win.cc
@@ -25,7 +25,7 @@
#include "content/public/browser/render_view_host.h"
#include "content/public/browser/web_contents.h"
#include "content/public/common/page_zoom.h"
-#include "ui/base/keycodes/keyboard_codes.h"
+#include "ui/events/keycodes/keyboard_codes.h"
#include "ui/views/focus/accelerator_handler.h"
#include "ui/views/widget/root_view.h"
diff --git a/chrome/browser/automation/testing_automation_provider.cc b/chrome/browser/automation/testing_automation_provider.cc
index c3cadf7..f2cb0dd 100644
--- a/chrome/browser/automation/testing_automation_provider.cc
+++ b/chrome/browser/automation/testing_automation_provider.cc
@@ -145,8 +145,8 @@
#include "net/cookies/cookie_store.h"
#include "third_party/WebKit/public/web/WebInputEvent.h"
#include "ui/base/events/event_constants.h"
-#include "ui/base/keycodes/keyboard_codes.h"
#include "ui/base/ui_base_types.h"
+#include "ui/events/keycodes/keyboard_codes.h"
#if defined(ENABLE_CONFIGURATION_POLICY)
#include "chrome/browser/policy/policy_service.h"
diff --git a/chrome/browser/browser_keyevents_browsertest.cc b/chrome/browser/browser_keyevents_browsertest.cc
index ee1bbc5..ef0d44f 100644
--- a/chrome/browser/browser_keyevents_browsertest.cc
+++ b/chrome/browser/browser_keyevents_browsertest.cc
@@ -26,7 +26,7 @@
#include "content/public/browser/web_contents_view.h"
#include "content/public/test/browser_test_utils.h"
#include "net/test/embedded_test_server/embedded_test_server.h"
-#include "ui/base/keycodes/keyboard_codes.h"
+#include "ui/events/keycodes/keyboard_codes.h"
#include "ui/views/controls/textfield/textfield.h"
// TODO(kbr): remove: http://crbug.com/222296
diff --git a/chrome/browser/chromeos/input_method/input_method_manager_impl_unittest.cc b/chrome/browser/chromeos/input_method/input_method_manager_impl_unittest.cc
index 15d289e..ea2276b 100644
--- a/chrome/browser/chromeos/input_method/input_method_manager_impl_unittest.cc
+++ b/chrome/browser/chromeos/input_method/input_method_manager_impl_unittest.cc
@@ -25,7 +25,7 @@
#include "chromeos/ime/mock_xkeyboard.h"
#include "testing/gtest/include/gtest/gtest.h"
#include "ui/base/accelerators/accelerator.h"
-#include "ui/base/keycodes/keyboard_codes.h"
+#include "ui/events/keycodes/keyboard_codes.h"
namespace chromeos {
diff --git a/chrome/browser/chromeos/power/user_activity_notifier.cc b/chrome/browser/chromeos/power/user_activity_notifier.cc
index 48fa344..b83538f 100644
--- a/chrome/browser/chromeos/power/user_activity_notifier.cc
+++ b/chrome/browser/chromeos/power/user_activity_notifier.cc
@@ -10,7 +10,7 @@
#include "chromeos/dbus/power_manager_client.h"
#include "ui/base/events/event.h"
#include "ui/base/events/event_constants.h"
-#include "ui/base/keycodes/keyboard_codes_posix.h"
+#include "ui/events/keycodes/keyboard_codes_posix.h"
namespace {
diff --git a/chrome/browser/extensions/extension_host.cc b/chrome/browser/extensions/extension_host.cc
index 974b4a3..031373a 100644
--- a/chrome/browser/extensions/extension_host.cc
+++ b/chrome/browser/extensions/extension_host.cc
@@ -56,9 +56,9 @@
#include "grit/browser_resources.h"
#include "grit/chromium_strings.h"
#include "grit/generated_resources.h"
-#include "ui/base/keycodes/keyboard_codes.h"
#include "ui/base/l10n/l10n_util.h"
#include "ui/base/resource/resource_bundle.h"
+#include "ui/events/keycodes/keyboard_codes.h"
#if !defined(OS_ANDROID)
#include "components/web_modal/web_contents_modal_dialog_manager.h"
diff --git a/chrome/browser/password_manager/password_manager_browsertest.cc b/chrome/browser/password_manager/password_manager_browsertest.cc
index 49c6361..54ecfe6 100644
--- a/chrome/browser/password_manager/password_manager_browsertest.cc
+++ b/chrome/browser/password_manager/password_manager_browsertest.cc
@@ -25,7 +25,7 @@
#include "content/public/test/test_utils.h"
#include "net/test/embedded_test_server/embedded_test_server.h"
#include "testing/gmock/include/gmock/gmock.h"
-#include "ui/base/keycodes/keyboard_codes.h"
+#include "ui/events/keycodes/keyboard_codes.h"
// NavigationObserver ---------------------------------------------------------
diff --git a/chrome/browser/ui/ash/event_rewriter.cc b/chrome/browser/ui/ash/event_rewriter.cc
index 7e1db96..3d4bba3 100644
--- a/chrome/browser/ui/ash/event_rewriter.cc
+++ b/chrome/browser/ui/ash/event_rewriter.cc
@@ -14,7 +14,7 @@
#include "ui/aura/root_window.h"
#include "ui/base/events/event.h"
#include "ui/base/events/event_utils.h"
-#include "ui/base/keycodes/keyboard_code_conversion.h"
+#include "ui/events/keycodes/keyboard_code_conversion.h"
#if defined(OS_CHROMEOS)
#include <X11/extensions/XInput2.h>
@@ -35,8 +35,8 @@
#include "chromeos/chromeos_switches.h"
#include "chromeos/ime/input_method_manager.h"
#include "chromeos/ime/xkeyboard.h"
-#include "ui/base/keycodes/keyboard_code_conversion_x.h"
#include "ui/base/x/x11_util.h"
+#include "ui/events/keycodes/keyboard_code_conversion_x.h"
#endif
namespace {
diff --git a/chrome/browser/ui/ash/event_rewriter.h b/chrome/browser/ui/ash/event_rewriter.h
index b819a00..1339318 100644
--- a/chrome/browser/ui/ash/event_rewriter.h
+++ b/chrome/browser/ui/ash/event_rewriter.h
@@ -14,7 +14,7 @@
#include "base/containers/hash_tables.h"
#include "base/memory/scoped_ptr.h"
#include "ui/aura/root_window_observer.h"
-#include "ui/base/keycodes/keyboard_codes.h"
+#include "ui/events/keycodes/keyboard_codes.h"
#if defined(OS_CHROMEOS)
#include "chrome/browser/chromeos/device_hierarchy_observer.h"
diff --git a/chrome/browser/ui/ash/ime_controller_chromeos_unittest.cc b/chrome/browser/ui/ash/ime_controller_chromeos_unittest.cc
index 5716d26..3ffa871 100644
--- a/chrome/browser/ui/ash/ime_controller_chromeos_unittest.cc
+++ b/chrome/browser/ui/ash/ime_controller_chromeos_unittest.cc
@@ -10,7 +10,7 @@
#include "testing/gtest/include/gtest/gtest.h"
#include "ui/base/accelerators/accelerator.h"
#include "ui/base/events/event_constants.h"
-#include "ui/base/keycodes/keyboard_codes.h"
+#include "ui/events/keycodes/keyboard_codes.h"
class ImeControllerTest : public testing::Test {
public:
diff --git a/chrome/browser/ui/browser_command_controller.cc b/chrome/browser/ui/browser_command_controller.cc
index b91d63f..fea6d8d 100644
--- a/chrome/browser/ui/browser_command_controller.cc
+++ b/chrome/browser/ui/browser_command_controller.cc
@@ -38,7 +38,7 @@
#include "content/public/browser/web_contents.h"
#include "content/public/browser/web_contents_observer.h"
#include "content/public/common/url_constants.h"
-#include "ui/base/keycodes/keyboard_codes.h"
+#include "ui/events/keycodes/keyboard_codes.h"
#if defined(OS_MACOSX)
#include "chrome/browser/ui/browser_commands_mac.h"
diff --git a/chrome/browser/ui/browser_command_controller_unittest.cc b/chrome/browser/ui/browser_command_controller_unittest.cc
index 9b9f4b7..52faed2 100644
--- a/chrome/browser/ui/browser_command_controller_unittest.cc
+++ b/chrome/browser/ui/browser_command_controller_unittest.cc
@@ -19,7 +19,7 @@
#include "chrome/test/base/testing_browser_process.h"
#include "chrome/test/base/testing_profile_manager.h"
#include "content/public/browser/native_web_keyboard_event.h"
-#include "ui/base/keycodes/keyboard_codes.h"
+#include "ui/events/keycodes/keyboard_codes.h"
typedef BrowserWithTestWindowTest BrowserCommandControllerTest;
diff --git a/chrome/browser/ui/cocoa/accelerator_utils_cocoa.mm b/chrome/browser/ui/cocoa/accelerator_utils_cocoa.mm
index 7a9077e..92b901f 100644
--- a/chrome/browser/ui/cocoa/accelerator_utils_cocoa.mm
+++ b/chrome/browser/ui/cocoa/accelerator_utils_cocoa.mm
@@ -8,7 +8,7 @@
#include "content/public/browser/native_web_keyboard_event.h"
#include "ui/base/accelerators/accelerator.h"
#import "ui/base/accelerators/platform_accelerator_cocoa.h"
-#import "ui/base/keycodes/keyboard_code_conversion_mac.h"
+#import "ui/events/keycodes/keyboard_code_conversion_mac.h"
namespace chrome {
diff --git a/chrome/browser/ui/cocoa/web_dialog_window_controller.mm b/chrome/browser/ui/cocoa/web_dialog_window_controller.mm
index 4460de9..4e7d2bf 100644
--- a/chrome/browser/ui/cocoa/web_dialog_window_controller.mm
+++ b/chrome/browser/ui/cocoa/web_dialog_window_controller.mm
@@ -15,7 +15,7 @@
#include "content/public/browser/web_contents.h"
#include "content/public/browser/web_contents_view.h"
#include "content/public/browser/web_ui_message_handler.h"
-#include "ui/base/keycodes/keyboard_codes.h"
+#include "ui/events/keycodes/keyboard_codes.h"
#include "ui/gfx/size.h"
#include "ui/web_dialogs/web_dialog_delegate.h"
#include "ui/web_dialogs/web_dialog_web_contents_delegate.h"
diff --git a/chrome/browser/ui/find_bar/find_bar_host_browsertest.cc b/chrome/browser/ui/find_bar/find_bar_host_browsertest.cc
index 5ea3c32..00b93bf 100644
--- a/chrome/browser/ui/find_bar/find_bar_host_browsertest.cc
+++ b/chrome/browser/ui/find_bar/find_bar_host_browsertest.cc
@@ -38,7 +38,7 @@
#include "content/public/test/browser_test_utils.h"
#include "net/base/net_util.h"
#include "ui/base/accelerators/accelerator.h"
-#include "ui/base/keycodes/keyboard_codes.h"
+#include "ui/events/keycodes/keyboard_codes.h"
using content::NavigationController;
using content::WebContents;
diff --git a/chrome/browser/ui/gtk/accelerators_gtk.cc b/chrome/browser/ui/gtk/accelerators_gtk.cc
index 9f9ffa9..874ecb0 100644
--- a/chrome/browser/ui/gtk/accelerators_gtk.cc
+++ b/chrome/browser/ui/gtk/accelerators_gtk.cc
@@ -12,7 +12,7 @@
#include "chrome/app/chrome_command_ids.h"
#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 {
diff --git a/chrome/browser/ui/gtk/browser_window_gtk.cc b/chrome/browser/ui/gtk/browser_window_gtk.cc
index 308c16b..ebc5d2b6 100644
--- a/chrome/browser/ui/gtk/browser_window_gtk.cc
+++ b/chrome/browser/ui/gtk/browser_window_gtk.cc
@@ -97,10 +97,10 @@
#include "ui/base/gtk/gtk_floating_container.h"
#include "ui/base/gtk/gtk_hig_constants.h"
#include "ui/base/gtk/gtk_screen_util.h"
-#include "ui/base/keycodes/keyboard_codes.h"
#include "ui/base/l10n/l10n_util.h"
#include "ui/base/resource/resource_bundle.h"
#include "ui/base/x/active_window_watcher_x.h"
+#include "ui/events/keycodes/keyboard_codes.h"
#include "ui/gfx/gtk_util.h"
#include "ui/gfx/image/cairo_cached_surface.h"
#include "ui/gfx/image/image.h"
diff --git a/chrome/browser/ui/libgtk2ui/gtk2_util.cc b/chrome/browser/ui/libgtk2ui/gtk2_util.cc
index 7994336..ba4b717 100644
--- a/chrome/browser/ui/libgtk2ui/gtk2_util.cc
+++ b/chrome/browser/ui/libgtk2ui/gtk2_util.cc
@@ -11,7 +11,7 @@
#include "base/memory/scoped_ptr.h"
#include "ui/base/accelerators/accelerator.h"
#include "ui/base/events/event_constants.h"
-#include "ui/base/keycodes/keyboard_code_conversion_x.h"
+#include "ui/events/keycodes/keyboard_code_conversion_x.h"
#include "ui/gfx/size.h"
namespace {
diff --git a/chrome/browser/ui/omnibox/omnibox_view_browsertest.cc b/chrome/browser/ui/omnibox/omnibox_view_browsertest.cc
index 1975b91..eab9aea 100644
--- a/chrome/browser/ui/omnibox/omnibox_view_browsertest.cc
+++ b/chrome/browser/ui/omnibox/omnibox_view_browsertest.cc
@@ -43,7 +43,7 @@
#include "ui/base/clipboard/clipboard.h"
#include "ui/base/clipboard/scoped_clipboard_writer.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"
#if defined(TOOLKIT_GTK)
diff --git a/chrome/browser/ui/views/accelerator_table.h b/chrome/browser/ui/views/accelerator_table.h
index a9650dc..f67a804 100644
--- a/chrome/browser/ui/views/accelerator_table.h
+++ b/chrome/browser/ui/views/accelerator_table.h
@@ -9,7 +9,7 @@
#include "chrome/browser/ui/host_desktop.h"
#include "chrome/browser/ui/views/chrome_views_export.h"
-#include "ui/base/keycodes/keyboard_codes.h"
+#include "ui/events/keycodes/keyboard_codes.h"
namespace ui {
class Accelerator;
diff --git a/chrome/browser/ui/views/autofill/autofill_popup_view_views.cc b/chrome/browser/ui/views/autofill/autofill_popup_view_views.cc
index 2c725f5..818112c 100644
--- a/chrome/browser/ui/views/autofill/autofill_popup_view_views.cc
+++ b/chrome/browser/ui/views/autofill/autofill_popup_view_views.cc
@@ -7,8 +7,8 @@
#include "chrome/browser/ui/autofill/autofill_popup_controller.h"
#include "grit/ui_resources.h"
#include "third_party/WebKit/public/web/WebAutofillClient.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/native_widget_types.h"
diff --git a/chrome/browser/ui/views/bookmarks/bookmark_bar_view_test.cc b/chrome/browser/ui/views/bookmarks/bookmark_bar_view_test.cc
index 79ea32d..a5d5a16 100644
--- a/chrome/browser/ui/views/bookmarks/bookmark_bar_view_test.cc
+++ b/chrome/browser/ui/views/bookmarks/bookmark_bar_view_test.cc
@@ -35,8 +35,8 @@
#include "grit/generated_resources.h"
#include "ui/base/accessibility/accessibility_types.h"
#include "ui/base/clipboard/clipboard.h"
-#include "ui/base/keycodes/keyboard_codes.h"
#include "ui/base/test/ui_controls.h"
+#include "ui/events/keycodes/keyboard_codes.h"
#include "ui/views/controls/button/menu_button.h"
#include "ui/views/controls/button/text_button.h"
#include "ui/views/controls/menu/menu_controller.h"
diff --git a/chrome/browser/ui/views/bookmarks/bookmark_bubble_view.cc b/chrome/browser/ui/views/bookmarks/bookmark_bubble_view.cc
index 3e0772f..0a3d031 100644
--- a/chrome/browser/ui/views/bookmarks/bookmark_bubble_view.cc
+++ b/chrome/browser/ui/views/bookmarks/bookmark_bubble_view.cc
@@ -19,9 +19,9 @@
#include "content/public/browser/user_metrics.h"
#include "grit/generated_resources.h"
#include "grit/theme_resources.h"
-#include "ui/base/keycodes/keyboard_codes.h"
#include "ui/base/l10n/l10n_util.h"
#include "ui/base/resource/resource_bundle.h"
+#include "ui/events/keycodes/keyboard_codes.h"
#include "ui/views/bubble/bubble_frame_view.h"
#include "ui/views/controls/button/label_button.h"
#include "ui/views/controls/combobox/combobox.h"
diff --git a/chrome/browser/ui/views/desktop_media_picker_views.cc b/chrome/browser/ui/views/desktop_media_picker_views.cc
index 4d18be5..507ce4e 100644
--- a/chrome/browser/ui/views/desktop_media_picker_views.cc
+++ b/chrome/browser/ui/views/desktop_media_picker_views.cc
@@ -9,8 +9,8 @@
#include "chrome/browser/media/desktop_media_picker_model.h"
#include "content/public/browser/browser_thread.h"
#include "grit/generated_resources.h"
-#include "ui/base/keycodes/keyboard_codes.h"
#include "ui/base/l10n/l10n_util.h"
+#include "ui/events/keycodes/keyboard_codes.h"
#include "ui/native_theme/native_theme.h"
#include "ui/views/controls/image_view.h"
#include "ui/views/controls/label.h"
diff --git a/chrome/browser/ui/views/dropdown_bar_host.cc b/chrome/browser/ui/views/dropdown_bar_host.cc
index c509cfd..dbeb127 100644
--- a/chrome/browser/ui/views/dropdown_bar_host.cc
+++ b/chrome/browser/ui/views/dropdown_bar_host.cc
@@ -10,7 +10,7 @@
#include "chrome/browser/ui/views/dropdown_bar_host_delegate.h"
#include "chrome/browser/ui/views/dropdown_bar_view.h"
#include "chrome/browser/ui/views/frame/browser_view.h"
-#include "ui/base/keycodes/keyboard_codes.h"
+#include "ui/events/keycodes/keyboard_codes.h"
#include "ui/gfx/animation/slide_animation.h"
#include "ui/gfx/path.h"
#include "ui/gfx/scrollbar_size.h"
diff --git a/chrome/browser/ui/views/dropdown_bar_host_win.cc b/chrome/browser/ui/views/dropdown_bar_host_win.cc
index f71528b..76a2b1b 100644
--- a/chrome/browser/ui/views/dropdown_bar_host_win.cc
+++ b/chrome/browser/ui/views/dropdown_bar_host_win.cc
@@ -10,7 +10,7 @@
#include "content/public/browser/web_contents.h"
#include "content/public/browser/web_contents_view.h"
#include "ui/base/events/event.h"
-#include "ui/base/keycodes/keyboard_code_conversion_win.h"
+#include "ui/events/keycodes/keyboard_code_conversion_win.h"
#include "ui/views/controls/scrollbar/native_scroll_bar.h"
using content::NativeWebKeyboardEvent;
diff --git a/chrome/browser/ui/views/find_bar_host.cc b/chrome/browser/ui/views/find_bar_host.cc
index 3f7233a..4207123 100644
--- a/chrome/browser/ui/views/find_bar_host.cc
+++ b/chrome/browser/ui/views/find_bar_host.cc
@@ -15,7 +15,7 @@
#include "content/public/browser/web_contents.h"
#include "content/public/browser/web_contents_view.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/external_focus_tracker.h"
#include "ui/views/focus/view_storage.h"
#include "ui/views/widget/root_view.h"
diff --git a/chrome/browser/ui/views/find_bar_host_interactive_uitest.cc b/chrome/browser/ui/views/find_bar_host_interactive_uitest.cc
index eca0f20..f26e65e1 100644
--- a/chrome/browser/ui/views/find_bar_host_interactive_uitest.cc
+++ b/chrome/browser/ui/views/find_bar_host_interactive_uitest.cc
@@ -21,7 +21,7 @@
#include "content/public/browser/web_contents.h"
#include "net/test/spawned_test_server/spawned_test_server.h"
#include "ui/base/clipboard/clipboard.h"
-#include "ui/base/keycodes/keyboard_codes.h"
+#include "ui/events/keycodes/keyboard_codes.h"
#include "ui/views/focus/focus_manager.h"
#include "ui/views/view.h"
#include "ui/views/views_delegate.h"
diff --git a/chrome/browser/ui/views/frame/global_menu_bar_x11.cc b/chrome/browser/ui/views/frame/global_menu_bar_x11.cc
index 24198aa..d0320cd 100644
--- a/chrome/browser/ui/views/frame/global_menu_bar_x11.cc
+++ b/chrome/browser/ui/views/frame/global_menu_bar_x11.cc
@@ -29,8 +29,8 @@
#include "content/public/browser/notification_source.h"
#include "grit/generated_resources.h"
#include "ui/base/accelerators/menu_label_accelerator_util_linux.h"
-#include "ui/base/keycodes/keyboard_code_conversion_x.h"
#include "ui/base/l10n/l10n_util.h"
+#include "ui/events/keycodes/keyboard_code_conversion_x.h"
#include "ui/gfx/text_elider.h"
// libdbusmenu-glib types
diff --git a/chrome/browser/ui/views/fullscreen_exit_bubble_views.cc b/chrome/browser/ui/views/fullscreen_exit_bubble_views.cc
index 362a489..e548e28 100644
--- a/chrome/browser/ui/views/fullscreen_exit_bubble_views.cc
+++ b/chrome/browser/ui/views/fullscreen_exit_bubble_views.cc
@@ -15,9 +15,9 @@
#include "content/public/browser/notification_service.h"
#include "grit/generated_resources.h"
#include "grit/ui_strings.h"
-#include "ui/base/keycodes/keyboard_codes.h"
#include "ui/base/l10n/l10n_util.h"
#include "ui/base/resource/resource_bundle.h"
+#include "ui/events/keycodes/keyboard_codes.h"
#include "ui/gfx/animation/slide_animation.h"
#include "ui/gfx/canvas.h"
#include "ui/gfx/screen.h"
diff --git a/chrome/browser/ui/views/javascript_app_modal_dialog_views.cc b/chrome/browser/ui/views/javascript_app_modal_dialog_views.cc
index ef485a1..73a7757 100644
--- a/chrome/browser/ui/views/javascript_app_modal_dialog_views.cc
+++ b/chrome/browser/ui/views/javascript_app_modal_dialog_views.cc
@@ -8,8 +8,8 @@
#include "chrome/browser/ui/app_modal_dialogs/javascript_app_modal_dialog.h"
#include "chrome/browser/ui/views/constrained_window_views.h"
#include "grit/generated_resources.h"
-#include "ui/base/keycodes/keyboard_codes.h"
#include "ui/base/l10n/l10n_util.h"
+#include "ui/events/keycodes/keyboard_codes.h"
#include "ui/views/controls/message_box_view.h"
#include "ui/views/controls/textfield/textfield.h"
#include "ui/views/widget/widget.h"
diff --git a/chrome/browser/ui/views/keyboard_access_browsertest.cc b/chrome/browser/ui/views/keyboard_access_browsertest.cc
index 908d1e7..e06dfbc 100644
--- a/chrome/browser/ui/views/keyboard_access_browsertest.cc
+++ b/chrome/browser/ui/views/keyboard_access_browsertest.cc
@@ -20,8 +20,8 @@
#include "chrome/test/base/interactive_test_utils.h"
#include "chrome/test/base/ui_test_utils.h"
#include "ui/base/events/event_constants.h"
-#include "ui/base/keycodes/keyboard_codes.h"
#include "ui/base/test/ui_controls.h"
+#include "ui/events/keycodes/keyboard_codes.h"
#include "ui/views/controls/menu/menu_listener.h"
#include "ui/views/focus/focus_manager.h"
#include "ui/views/view.h"
diff --git a/chrome/browser/ui/views/omnibox/omnibox_view_win.cc b/chrome/browser/ui/views/omnibox/omnibox_view_win.cc
index f51627b..53cb06a 100644
--- a/chrome/browser/ui/views/omnibox/omnibox_view_win.cc
+++ b/chrome/browser/ui/views/omnibox/omnibox_view_win.cc
@@ -58,12 +58,12 @@
#include "ui/base/events/event_constants.h"
#include "ui/base/ime/win/tsf_bridge.h"
#include "ui/base/ime/win/tsf_event_router.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/touch/touch_enabled.h"
#include "ui/base/win/mouse_wheel_util.h"
#include "ui/base/win/touch_input.h"
+#include "ui/events/keycodes/keyboard_codes.h"
#include "ui/gfx/canvas.h"
#include "ui/gfx/image/image.h"
#include "ui/gfx/win/hwnd_util.h"
diff --git a/chrome/browser/ui/views/sync/one_click_signin_bubble_view.cc b/chrome/browser/ui/views/sync/one_click_signin_bubble_view.cc
index dbb3752..9469d51 100644
--- a/chrome/browser/ui/views/sync/one_click_signin_bubble_view.cc
+++ b/chrome/browser/ui/views/sync/one_click_signin_bubble_view.cc
@@ -16,9 +16,9 @@
#include "grit/generated_resources.h"
#include "grit/theme_resources.h"
#include "grit/ui_resources.h"
-#include "ui/base/keycodes/keyboard_codes.h"
#include "ui/base/l10n/l10n_util.h"
#include "ui/base/resource/resource_bundle.h"
+#include "ui/events/keycodes/keyboard_codes.h"
#include "ui/views/controls/button/image_button.h"
#include "ui/views/controls/button/label_button.h"
#include "ui/views/controls/image_view.h"
diff --git a/chrome/browser/ui/views/tab_contents/render_view_context_menu_views.cc b/chrome/browser/ui/views/tab_contents/render_view_context_menu_views.cc
index 3349064..19294ba 100644
--- a/chrome/browser/ui/views/tab_contents/render_view_context_menu_views.cc
+++ b/chrome/browser/ui/views/tab_contents/render_view_context_menu_views.cc
@@ -12,7 +12,7 @@
#include "content/public/browser/web_contents_view.h"
#include "grit/generated_resources.h"
#include "ui/base/accelerators/accelerator.h"
-#include "ui/base/keycodes/keyboard_codes.h"
+#include "ui/events/keycodes/keyboard_codes.h"
#include "ui/gfx/point.h"
#include "ui/views/controls/menu/menu_item_view.h"
#include "ui/views/controls/menu/menu_runner.h"
diff --git a/chrome/renderer/autofill/page_click_tracker_browsertest.cc b/chrome/renderer/autofill/page_click_tracker_browsertest.cc
index 596a7c77..2a2b55c 100644
--- a/chrome/renderer/autofill/page_click_tracker_browsertest.cc
+++ b/chrome/renderer/autofill/page_click_tracker_browsertest.cc
@@ -12,7 +12,7 @@
#include "third_party/WebKit/public/web/WebInputElement.h"
#include "third_party/WebKit/public/web/WebView.h"
#include "third_party/WebKit/public/platform/WebSize.h"
-#include "ui/base/keycodes/keyboard_codes.h"
+#include "ui/events/keycodes/keyboard_codes.h"
namespace autofill {
diff --git a/chrome/renderer/autofill/password_autofill_agent_browsertest.cc b/chrome/renderer/autofill/password_autofill_agent_browsertest.cc
index ed955c5..6f83caa 100644
--- a/chrome/renderer/autofill/password_autofill_agent_browsertest.cc
+++ b/chrome/renderer/autofill/password_autofill_agent_browsertest.cc
@@ -21,7 +21,7 @@
#include "third_party/WebKit/public/web/WebInputElement.h"
#include "third_party/WebKit/public/web/WebNode.h"
#include "third_party/WebKit/public/web/WebView.h"
-#include "ui/base/keycodes/keyboard_codes.h"
+#include "ui/events/keycodes/keyboard_codes.h"
using autofill::PasswordForm;
using WebKit::WebDocument;
diff --git a/chrome/renderer/searchbox/searchbox_extension.cc b/chrome/renderer/searchbox/searchbox_extension.cc
index 604e9ea..96797b5 100644
--- a/chrome/renderer/searchbox/searchbox_extension.cc
+++ b/chrome/renderer/searchbox/searchbox_extension.cc
@@ -22,9 +22,9 @@
#include "third_party/WebKit/public/web/WebFrame.h"
#include "third_party/WebKit/public/web/WebScriptSource.h"
#include "third_party/WebKit/public/web/WebView.h"
-#include "ui/base/keycodes/keyboard_codes.h"
#include "ui/base/resource/resource_bundle.h"
#include "ui/base/window_open_disposition.h"
+#include "ui/events/keycodes/keyboard_codes.h"
#include "url/gurl.h"
#include "v8/include/v8.h"
diff --git a/chrome/test/automation/automation_json_requests.h b/chrome/test/automation/automation_json_requests.h
index 6f8a5f3..8abd32ac 100644
--- a/chrome/test/automation/automation_json_requests.h
+++ b/chrome/test/automation/automation_json_requests.h
@@ -14,7 +14,7 @@
#include "base/strings/string_number_conversions.h"
#include "chrome/common/automation_constants.h"
#include "chrome/common/automation_id.h"
-#include "ui/base/keycodes/keyboard_codes.h"
+#include "ui/events/keycodes/keyboard_codes.h"
class AutomationMessageSender;
diff --git a/chrome/test/automation/tab_proxy.h b/chrome/test/automation/tab_proxy.h
index ed8b12d..a4cbd2c 100644
--- a/chrome/test/automation/tab_proxy.h
+++ b/chrome/test/automation/tab_proxy.h
@@ -23,8 +23,8 @@
#include "content/public/common/page_type.h"
#include "content/public/common/security_style.h"
#include "net/cert/cert_status_flags.h"
-#include "ui/base/keycodes/keyboard_codes.h"
#include "ui/base/window_open_disposition.h"
+#include "ui/events/keycodes/keyboard_codes.h"
class BrowserProxy;
class GURL;
diff --git a/chrome/test/base/ui_test_utils.h b/chrome/test/base/ui_test_utils.h
index 135d9a9..949611e 100644
--- a/chrome/test/base/ui_test_utils.h
+++ b/chrome/test/base/ui_test_utils.h
@@ -21,8 +21,8 @@
#include "content/public/browser/notification_source.h"
#include "content/public/test/test_utils.h"
#include "testing/gtest/include/gtest/gtest.h"
-#include "ui/base/keycodes/keyboard_codes.h"
#include "ui/base/window_open_disposition.h"
+#include "ui/events/keycodes/keyboard_codes.h"
#include "ui/gfx/native_widget_types.h"
#include "url/gurl.h"
diff --git a/chrome/test/chromedriver/chrome/ui_events.h b/chrome/test/chromedriver/chrome/ui_events.h
index 84c1561..88138dc 100644
--- a/chrome/test/chromedriver/chrome/ui_events.h
+++ b/chrome/test/chromedriver/chrome/ui_events.h
@@ -7,7 +7,7 @@
#include <string>
-#include "ui/base/keycodes/keyboard_codes.h"
+#include "ui/events/keycodes/keyboard_codes.h"
// Specifies the type of the mouse event.
enum MouseEventType {
diff --git a/chrome/test/chromedriver/key_converter.h b/chrome/test/chromedriver/key_converter.h
index 6f647bcb..4cbb0b4 100644
--- a/chrome/test/chromedriver/key_converter.h
+++ b/chrome/test/chromedriver/key_converter.h
@@ -9,7 +9,7 @@
#include <string>
#include "base/strings/string16.h"
-#include "ui/base/keycodes/keyboard_codes.h"
+#include "ui/events/keycodes/keyboard_codes.h"
struct KeyEvent;
class Status;
diff --git a/chrome/test/chromedriver/keycode_text_conversion.h b/chrome/test/chromedriver/keycode_text_conversion.h
index 587bdaf..294a8b7 100644
--- a/chrome/test/chromedriver/keycode_text_conversion.h
+++ b/chrome/test/chromedriver/keycode_text_conversion.h
@@ -8,7 +8,7 @@
#include <string>
#include "base/strings/string16.h"
-#include "ui/base/keycodes/keyboard_codes.h"
+#include "ui/events/keycodes/keyboard_codes.h"
// These functions only support conversion of characters in the BMP
// (Basic Multilingual Plane).
diff --git a/chrome/test/chromedriver/keycode_text_conversion_mac.mm b/chrome/test/chromedriver/keycode_text_conversion_mac.mm
index d83df65..ed00190 100644
--- a/chrome/test/chromedriver/keycode_text_conversion_mac.mm
+++ b/chrome/test/chromedriver/keycode_text_conversion_mac.mm
@@ -11,7 +11,7 @@
#include "base/mac/scoped_cftyperef.h"
#include "base/strings/utf_string_conversions.h"
#include "chrome/test/chromedriver/chrome/ui_events.h"
-#include "ui/base/keycodes/keyboard_code_conversion_mac.h"
+#include "ui/events/keycodes/keyboard_code_conversion_mac.h"
bool ConvertKeyCodeToText(
ui::KeyboardCode key_code, int modifiers, std::string* text,
diff --git a/chrome/test/chromedriver/keycode_text_conversion_unittest.cc b/chrome/test/chromedriver/keycode_text_conversion_unittest.cc
index db3cc35..f13ca21 100644
--- a/chrome/test/chromedriver/keycode_text_conversion_unittest.cc
+++ b/chrome/test/chromedriver/keycode_text_conversion_unittest.cc
@@ -10,7 +10,7 @@
#include "chrome/test/chromedriver/keycode_text_conversion.h"
#include "chrome/test/chromedriver/test_util.h"
#include "testing/gtest/include/gtest/gtest.h"
-#include "ui/base/keycodes/keyboard_codes.h"
+#include "ui/events/keycodes/keyboard_codes.h"
namespace {
diff --git a/chrome/test/chromedriver/keycode_text_conversion_x.cc b/chrome/test/chromedriver/keycode_text_conversion_x.cc
index 31c502f..349c431 100644
--- a/chrome/test/chromedriver/keycode_text_conversion_x.cc
+++ b/chrome/test/chromedriver/keycode_text_conversion_x.cc
@@ -12,8 +12,8 @@
#include "base/strings/utf_string_conversions.h"
#include "chrome/test/chromedriver/chrome/ui_events.h"
-#include "ui/base/keycodes/keyboard_code_conversion_x.h"
#include "ui/base/x/x11_util.h"
+#include "ui/events/keycodes/keyboard_code_conversion_x.h"
namespace {
diff --git a/chrome/test/reliability/automated_ui_tests.cc b/chrome/test/reliability/automated_ui_tests.cc
index e59f436..5348e60 100644
--- a/chrome/test/reliability/automated_ui_tests.cc
+++ b/chrome/test/reliability/automated_ui_tests.cc
@@ -36,7 +36,7 @@
#include "chrome/test/automation/window_proxy.h"
#include "chrome/test/reliability/automated_ui_tests.h"
#include "chrome/test/ui/ui_test.h"
-#include "ui/base/keycodes/keyboard_codes.h"
+#include "ui/events/keycodes/keyboard_codes.h"
#include "url/gurl.h"
#if defined(TOOLKIT_VIEWS)
diff --git a/chrome/test/reliability/automated_ui_tests.h b/chrome/test/reliability/automated_ui_tests.h
index 06cd21f..4cb6055 100644
--- a/chrome/test/reliability/automated_ui_tests.h
+++ b/chrome/test/reliability/automated_ui_tests.h
@@ -105,7 +105,7 @@
#include "chrome/test/reliability/automated_ui_test_base.h"
#include "chrome/test/ui/ui_test.h"
#include "third_party/libxml/chromium/libxml_utils.h"
-#include "ui/base/keycodes/keyboard_codes.h"
+#include "ui/events/keycodes/keyboard_codes.h"
namespace base {
class Time;
diff --git a/chrome/test/webdriver/keycode_text_conversion.h b/chrome/test/webdriver/keycode_text_conversion.h
index c1f7e33..34711d9 100644
--- a/chrome/test/webdriver/keycode_text_conversion.h
+++ b/chrome/test/webdriver/keycode_text_conversion.h
@@ -8,7 +8,7 @@
#include <string>
#include "base/strings/string16.h"
-#include "ui/base/keycodes/keyboard_codes.h"
+#include "ui/events/keycodes/keyboard_codes.h"
namespace webdriver {
diff --git a/chrome/test/webdriver/keycode_text_conversion_gtk.cc b/chrome/test/webdriver/keycode_text_conversion_gtk.cc
index b3eb12c..c3b1151f 100644
--- a/chrome/test/webdriver/keycode_text_conversion_gtk.cc
+++ b/chrome/test/webdriver/keycode_text_conversion_gtk.cc
@@ -9,7 +9,7 @@
#include "base/strings/string_util.h"
#include "base/strings/utf_string_conversions.h"
#include "chrome/common/automation_constants.h"
-#include "ui/base/keycodes/keyboard_code_conversion_gtk.h"
+#include "ui/events/keycodes/keyboard_code_conversion_gtk.h"
namespace webdriver {
diff --git a/chrome/test/webdriver/keycode_text_conversion_mac.mm b/chrome/test/webdriver/keycode_text_conversion_mac.mm
index aa2e424..19c77f4 100644
--- a/chrome/test/webdriver/keycode_text_conversion_mac.mm
+++ b/chrome/test/webdriver/keycode_text_conversion_mac.mm
@@ -11,7 +11,7 @@
#include "base/mac/scoped_cftyperef.h"
#include "base/strings/utf_string_conversions.h"
#include "chrome/common/automation_constants.h"
-#include "ui/base/keycodes/keyboard_code_conversion_mac.h"
+#include "ui/events/keycodes/keyboard_code_conversion_mac.h"
namespace webdriver {
diff --git a/chrome/test/webdriver/keycode_text_conversion_unittest.cc b/chrome/test/webdriver/keycode_text_conversion_unittest.cc
index 0b53c7a..627cd68 100644
--- a/chrome/test/webdriver/keycode_text_conversion_unittest.cc
+++ b/chrome/test/webdriver/keycode_text_conversion_unittest.cc
@@ -10,7 +10,7 @@
#include "chrome/test/webdriver/keycode_text_conversion.h"
#include "chrome/test/webdriver/webdriver_test_util.h"
#include "testing/gtest/include/gtest/gtest.h"
-#include "ui/base/keycodes/keyboard_codes.h"
+#include "ui/events/keycodes/keyboard_codes.h"
using automation::kShiftKeyMask;
using webdriver::ConvertKeyCodeToText;
diff --git a/chrome/test/webdriver/keycode_text_conversion_x.cc b/chrome/test/webdriver/keycode_text_conversion_x.cc
index 8038bdc..b5cb42d 100644
--- a/chrome/test/webdriver/keycode_text_conversion_x.cc
+++ b/chrome/test/webdriver/keycode_text_conversion_x.cc
@@ -12,8 +12,8 @@
#include "base/strings/utf_string_conversions.h"
#include "chrome/common/automation_constants.h"
-#include "ui/base/keycodes/keyboard_code_conversion_x.h"
#include "ui/base/x/x11_util.h"
+#include "ui/events/keycodes/keyboard_code_conversion_x.h"
namespace webdriver {
diff --git a/chrome/test/webdriver/webdriver_automation.h b/chrome/test/webdriver/webdriver_automation.h
index 6848ae2..b5cb73d 100644
--- a/chrome/test/webdriver/webdriver_automation.h
+++ b/chrome/test/webdriver/webdriver_automation.h
@@ -15,7 +15,7 @@
#include "base/memory/scoped_ptr.h"
#include "chrome/common/automation_constants.h"
#include "chrome/test/webdriver/webdriver_logging.h"
-#include "ui/base/keycodes/keyboard_codes.h"
+#include "ui/events/keycodes/keyboard_codes.h"
class AutomationId;
class AutomationProxy;
diff --git a/chrome/test/webdriver/webdriver_key_converter.h b/chrome/test/webdriver/webdriver_key_converter.h
index 1743fdb..85fa7a2 100644
--- a/chrome/test/webdriver/webdriver_key_converter.h
+++ b/chrome/test/webdriver/webdriver_key_converter.h
@@ -10,7 +10,7 @@
#include "base/strings/string16.h"
#include "chrome/test/webdriver/webdriver_automation.h"
-#include "ui/base/keycodes/keyboard_codes.h"
+#include "ui/events/keycodes/keyboard_codes.h"
namespace webdriver {
diff --git a/components/autofill/content/renderer/autofill_agent.cc b/components/autofill/content/renderer/autofill_agent.cc
index fd521ca..ca57847 100644
--- a/components/autofill/content/renderer/autofill_agent.cc
+++ b/components/autofill/content/renderer/autofill_agent.cc
@@ -39,8 +39,8 @@
#include "third_party/WebKit/public/web/WebNodeCollection.h"
#include "third_party/WebKit/public/web/WebOptionElement.h"
#include "third_party/WebKit/public/web/WebView.h"
-#include "ui/base/keycodes/keyboard_codes.h"
#include "ui/base/l10n/l10n_util.h"
+#include "ui/events/keycodes/keyboard_codes.h"
using WebKit::WebAutofillClient;
using WebKit::WebFormControlElement;
diff --git a/components/autofill/content/renderer/password_autofill_agent.cc b/components/autofill/content/renderer/password_autofill_agent.cc
index 01e2578..ce2f103 100644
--- a/components/autofill/content/renderer/password_autofill_agent.cc
+++ b/components/autofill/content/renderer/password_autofill_agent.cc
@@ -28,7 +28,7 @@
#include "third_party/WebKit/public/web/WebSecurityOrigin.h"
#include "third_party/WebKit/public/web/WebUserGestureIndicator.h"
#include "third_party/WebKit/public/web/WebView.h"
-#include "ui/base/keycodes/keyboard_codes.h"
+#include "ui/events/keycodes/keyboard_codes.h"
namespace autofill {
namespace {
diff --git a/components/autofill/core/browser/password_autofill_manager.cc b/components/autofill/core/browser/password_autofill_manager.cc
index b568f8d..def93f4 100644
--- a/components/autofill/core/browser/password_autofill_manager.cc
+++ b/components/autofill/core/browser/password_autofill_manager.cc
@@ -6,7 +6,7 @@
#include "components/autofill/core/common/autofill_messages.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"
namespace autofill {
diff --git a/content/DEPS b/content/DEPS
index 356e747..dd0a7d6 100644
--- a/content/DEPS
+++ b/content/DEPS
@@ -78,6 +78,7 @@ include_rules = [
"+ui/aura",
"+ui/base",
"+ui/compositor",
+ "+ui/events",
"+ui/gfx",
"+ui/gl",
"+ui/native_theme",
diff --git a/content/browser/browser_plugin/browser_plugin_guest.cc b/content/browser/browser_plugin/browser_plugin_guest.cc
index 5960c95..f7fd737 100644
--- a/content/browser/browser_plugin/browser_plugin_guest.cc
+++ b/content/browser/browser_plugin/browser_plugin_guest.cc
@@ -46,7 +46,7 @@
#include "content/public/common/url_utils.h"
#include "net/url_request/url_request.h"
#include "third_party/WebKit/public/web/WebCursorInfo.h"
-#include "ui/base/keycodes/keyboard_codes.h"
+#include "ui/events/keycodes/keyboard_codes.h"
#include "ui/surface/transport_dib.h"
#include "webkit/common/resource_type.h"
diff --git a/content/browser/browser_plugin/browser_plugin_guest_manager.cc b/content/browser/browser_plugin/browser_plugin_guest_manager.cc
index 75de203..6c86331b 100644
--- a/content/browser/browser_plugin/browser_plugin_guest_manager.cc
+++ b/content/browser/browser_plugin/browser_plugin_guest_manager.cc
@@ -17,7 +17,7 @@
#include "content/public/common/result_codes.h"
#include "content/public/common/url_constants.h"
#include "net/base/escape.h"
-#include "ui/base/keycodes/keyboard_codes.h"
+#include "ui/events/keycodes/keyboard_codes.h"
namespace content {
diff --git a/content/browser/renderer_host/input/immediate_input_router.cc b/content/browser/renderer_host/input/immediate_input_router.cc
index 5613b42..d1c5a57d 100644
--- a/content/browser/renderer_host/input/immediate_input_router.cc
+++ b/content/browser/renderer_host/input/immediate_input_router.cc
@@ -22,7 +22,7 @@
#include "content/public/browser/user_metrics.h"
#include "content/public/common/content_switches.h"
#include "ui/base/events/event.h"
-#include "ui/base/keycodes/keyboard_codes.h"
+#include "ui/events/keycodes/keyboard_codes.h"
using base::Time;
using base::TimeDelta;
diff --git a/content/browser/renderer_host/input/immediate_input_router_unittest.cc b/content/browser/renderer_host/input/immediate_input_router_unittest.cc
index 3d540e0..4d377ec 100644
--- a/content/browser/renderer_host/input/immediate_input_router_unittest.cc
+++ b/content/browser/renderer_host/input/immediate_input_router_unittest.cc
@@ -17,7 +17,7 @@
#include "content/public/test/mock_render_process_host.h"
#include "content/public/test/test_browser_context.h"
#include "testing/gtest/include/gtest/gtest.h"
-#include "ui/base/keycodes/keyboard_codes.h"
+#include "ui/events/keycodes/keyboard_codes.h"
#if defined(OS_WIN) || defined(USE_AURA)
#include "content/browser/renderer_host/ui_events_helper.h"
diff --git a/content/browser/renderer_host/input/input_router_unittest.cc b/content/browser/renderer_host/input/input_router_unittest.cc
index 746b3c3..aa46f9c 100644
--- a/content/browser/renderer_host/input/input_router_unittest.cc
+++ b/content/browser/renderer_host/input/input_router_unittest.cc
@@ -6,7 +6,7 @@
#include "content/browser/renderer_host/input/input_router.h"
#include "content/common/input_messages.h"
-#include "ui/base/keycodes/keyboard_codes.h"
+#include "ui/events/keycodes/keyboard_codes.h"
#if defined(OS_WIN) || defined(USE_AURA)
#include "content/browser/renderer_host/ui_events_helper.h"
diff --git a/content/browser/renderer_host/input/web_input_event_builders_android.cc b/content/browser/renderer_host/input/web_input_event_builders_android.cc
index eca820b..b5c96c6 100644
--- a/content/browser/renderer_host/input/web_input_event_builders_android.cc
+++ b/content/browser/renderer_host/input/web_input_event_builders_android.cc
@@ -7,8 +7,8 @@
#include "base/logging.h"
#include "content/browser/renderer_host/input/web_input_event_util.h"
#include "content/browser/renderer_host/input/web_input_event_util_posix.h"
-#include "ui/base/keycodes/keyboard_code_conversion_android.h"
-#include "ui/base/keycodes/keyboard_codes_posix.h"
+#include "ui/events/keycodes/keyboard_code_conversion_android.h"
+#include "ui/events/keycodes/keyboard_codes_posix.h"
namespace content {
diff --git a/content/browser/renderer_host/input/web_input_event_builders_gtk.cc b/content/browser/renderer_host/input/web_input_event_builders_gtk.cc
index 0a51ea3..d6faebe 100644
--- a/content/browser/renderer_host/input/web_input_event_builders_gtk.cc
+++ b/content/browser/renderer_host/input/web_input_event_builders_gtk.cc
@@ -11,7 +11,7 @@
#include "base/logging.h"
#include "content/browser/renderer_host/input/web_input_event_util_posix.h"
#include "third_party/WebKit/public/web/WebInputEvent.h"
-#include "ui/base/keycodes/keyboard_code_conversion_gtk.h"
+#include "ui/events/keycodes/keyboard_code_conversion_gtk.h"
using WebKit::WebInputEvent;
using WebKit::WebMouseEvent;
diff --git a/content/browser/renderer_host/input/web_input_event_builders_gtk.h b/content/browser/renderer_host/input/web_input_event_builders_gtk.h
index 38a169b..6fe1642 100644
--- a/content/browser/renderer_host/input/web_input_event_builders_gtk.h
+++ b/content/browser/renderer_host/input/web_input_event_builders_gtk.h
@@ -7,7 +7,7 @@
#include "content/common/content_export.h"
#include "third_party/WebKit/public/web/WebInputEvent.h"
-#include "ui/base/keycodes/keyboard_codes.h"
+#include "ui/events/keycodes/keyboard_codes.h"
typedef struct _GdkEventButton GdkEventButton;
typedef struct _GdkEventMotion GdkEventMotion;
diff --git a/content/browser/renderer_host/input/web_input_event_builders_gtk_unittest.cc b/content/browser/renderer_host/input/web_input_event_builders_gtk_unittest.cc
index 051b2cea..9498c9e 100644
--- a/content/browser/renderer_host/input/web_input_event_builders_gtk_unittest.cc
+++ b/content/browser/renderer_host/input/web_input_event_builders_gtk_unittest.cc
@@ -9,7 +9,7 @@
#include "testing/gtest/include/gtest/gtest.h"
#include "third_party/WebKit/public/web/WebInputEvent.h"
-#include "ui/base/keycodes/keyboard_code_conversion_gtk.h"
+#include "ui/events/keycodes/keyboard_code_conversion_gtk.h"
using WebKit::WebInputEvent;
using WebKit::WebKeyboardEvent;
diff --git a/content/browser/renderer_host/input/web_input_event_util.h b/content/browser/renderer_host/input/web_input_event_util.h
index 75870eb..1abaf8c 100644
--- a/content/browser/renderer_host/input/web_input_event_util.h
+++ b/content/browser/renderer_host/input/web_input_event_util.h
@@ -6,7 +6,7 @@
#define CONTENT_BROWSER_RENDERER_HOST_INPUT_WEB_INPUT_EVENT_UTIL_H_
#include "content/common/content_export.h"
-#include "ui/base/keycodes/keyboard_codes.h"
+#include "ui/events/keycodes/keyboard_codes.h"
namespace WebKit {
class WebKeyboardEvent;
diff --git a/content/browser/renderer_host/input/web_input_event_util_posix.h b/content/browser/renderer_host/input/web_input_event_util_posix.h
index 34e4ee9..e7dc154 100644
--- a/content/browser/renderer_host/input/web_input_event_util_posix.h
+++ b/content/browser/renderer_host/input/web_input_event_util_posix.h
@@ -6,7 +6,7 @@
#define CONTENT_BROWSER_RENDERER_HOST_INPUT_WEB_INPUT_EVENT_UTIL_POSIX_H_
#include "third_party/WebKit/public/web/WebInputEvent.h"
-#include "ui/base/keycodes/keyboard_codes.h"
+#include "ui/events/keycodes/keyboard_codes.h"
namespace content {
diff --git a/content/browser/renderer_host/render_widget_host_impl.cc b/content/browser/renderer_host/render_widget_host_impl.cc
index 1f81647..d0f748f 100644
--- a/content/browser/renderer_host/render_widget_host_impl.cc
+++ b/content/browser/renderer_host/render_widget_host_impl.cc
@@ -54,7 +54,7 @@
#include "skia/ext/platform_canvas.h"
#include "third_party/WebKit/public/web/WebCompositionUnderline.h"
#include "ui/base/events/event.h"
-#include "ui/base/keycodes/keyboard_codes.h"
+#include "ui/events/keycodes/keyboard_codes.h"
#include "ui/gfx/size_conversions.h"
#include "ui/gfx/skbitmap_operations.h"
#include "ui/gfx/vector2d_conversions.h"
diff --git a/content/browser/renderer_host/render_widget_host_unittest.cc b/content/browser/renderer_host/render_widget_host_unittest.cc
index e7ab22d..49ab827 100644
--- a/content/browser/renderer_host/render_widget_host_unittest.cc
+++ b/content/browser/renderer_host/render_widget_host_unittest.cc
@@ -29,7 +29,7 @@
#include "content/public/test/mock_render_process_host.h"
#include "content/public/test/test_browser_context.h"
#include "testing/gtest/include/gtest/gtest.h"
-#include "ui/base/keycodes/keyboard_codes.h"
+#include "ui/events/keycodes/keyboard_codes.h"
#include "ui/gfx/canvas.h"
#include "ui/gfx/screen.h"
diff --git a/content/browser/renderer_host/render_widget_host_view_mac.mm b/content/browser/renderer_host/render_widget_host_view_mac.mm
index d0e9638..6096798 100644
--- a/content/browser/renderer_host/render_widget_host_view_mac.mm
+++ b/content/browser/renderer_host/render_widget_host_view_mac.mm
@@ -55,7 +55,7 @@
#include "ui/base/cocoa/animation_utils.h"
#import "ui/base/cocoa/fullscreen_window_manager.h"
#import "ui/base/cocoa/underlay_opengl_hosting_window.h"
-#include "ui/base/keycodes/keyboard_codes.h"
+#include "ui/events/keycodes/keyboard_codes.h"
#include "ui/base/layout.h"
#include "ui/gfx/display.h"
#include "ui/gfx/point.h"
diff --git a/content/browser/renderer_host/web_input_event_aurax11.cc b/content/browser/renderer_host/web_input_event_aurax11.cc
index d892c44..b8be432 100644
--- a/content/browser/renderer_host/web_input_event_aurax11.cc
+++ b/content/browser/renderer_host/web_input_event_aurax11.cc
@@ -47,8 +47,8 @@
#include "content/browser/renderer_host/ui_events_helper.h"
#include "ui/base/events/event.h"
#include "ui/base/events/event_constants.h"
-#include "ui/base/keycodes/keyboard_code_conversion_x.h"
-#include "ui/base/keycodes/keyboard_codes.h"
+#include "ui/events/keycodes/keyboard_code_conversion_x.h"
+#include "ui/events/keycodes/keyboard_codes.h"
namespace content {
diff --git a/content/public/test/browser_test_utils.h b/content/public/test/browser_test_utils.h
index 50ff77f..3efae77 100644
--- a/content/public/test/browser_test_utils.h
+++ b/content/public/test/browser_test_utils.h
@@ -18,7 +18,7 @@
#include "content/public/browser/notification_observer.h"
#include "content/public/browser/notification_registrar.h"
#include "third_party/WebKit/public/web/WebInputEvent.h"
-#include "ui/base/keycodes/keyboard_codes.h"
+#include "ui/events/keycodes/keyboard_codes.h"
#include "url/gurl.h"
#if defined(OS_WIN)
diff --git a/content/renderer/browser_plugin/browser_plugin.cc b/content/renderer/browser_plugin/browser_plugin.cc
index c80b8c7..71aac85 100644
--- a/content/renderer/browser_plugin/browser_plugin.cc
+++ b/content/renderer/browser_plugin/browser_plugin.cc
@@ -37,7 +37,7 @@
#include "third_party/WebKit/public/web/WebPluginParams.h"
#include "third_party/WebKit/public/web/WebScriptSource.h"
#include "third_party/WebKit/public/web/WebView.h"
-#include "ui/base/keycodes/keyboard_codes.h"
+#include "ui/events/keycodes/keyboard_codes.h"
#if defined (OS_WIN)
#include "base/sys_info.h"
diff --git a/content/renderer/render_view_browsertest.cc b/content/renderer/render_view_browsertest.cc
index 74a3ee8..f241345 100644
--- a/content/renderer/render_view_browsertest.cc
+++ b/content/renderer/render_view_browsertest.cc
@@ -37,7 +37,7 @@
#include "third_party/WebKit/public/web/WebRuntimeFeatures.h"
#include "third_party/WebKit/public/web/WebView.h"
#include "third_party/WebKit/public/web/WebWindowFeatures.h"
-#include "ui/base/keycodes/keyboard_codes.h"
+#include "ui/events/keycodes/keyboard_codes.h"
#include "ui/gfx/codec/jpeg_codec.h"
#include "ui/gfx/range/range.h"
@@ -52,8 +52,8 @@
#if defined(USE_AURA) && defined(USE_X11)
#include <X11/Xlib.h>
#include "ui/base/events/event_constants.h"
-#include "ui/base/keycodes/keyboard_code_conversion.h"
#include "ui/base/x/x11_util.h"
+#include "ui/events/keycodes/keyboard_code_conversion.h"
#endif
using WebKit::WebFrame;
diff --git a/media/DEPS b/media/DEPS
index 61ad8cf..b46ee56 100644
--- a/media/DEPS
+++ b/media/DEPS
@@ -7,6 +7,7 @@ include_rules = [
"+third_party/opus",
"+third_party/skia",
"+ui/base",
+ "+ui/events",
"+ui/gfx",
"+ui/gl",
]
diff --git a/media/base/keyboard_event_counter.h b/media/base/keyboard_event_counter.h
index d8e76b0..873448d 100644
--- a/media/base/keyboard_event_counter.h
+++ b/media/base/keyboard_event_counter.h
@@ -10,7 +10,7 @@
#include "base/synchronization/lock.h"
#include "media/base/media_export.h"
#include "ui/base/events/event_constants.h"
-#include "ui/base/keycodes/keyboard_codes.h"
+#include "ui/events/keycodes/keyboard_codes.h"
namespace media {
diff --git a/media/base/user_input_monitor_linux.cc b/media/base/user_input_monitor_linux.cc
index 138de0a..b5dbbe5 100644
--- a/media/base/user_input_monitor_linux.cc
+++ b/media/base/user_input_monitor_linux.cc
@@ -23,7 +23,7 @@
#include "base/synchronization/lock.h"
#include "media/base/keyboard_event_counter.h"
#include "third_party/skia/include/core/SkPoint.h"
-#include "ui/base/keycodes/keyboard_code_conversion_x.h"
+#include "ui/events/keycodes/keyboard_code_conversion_x.h"
// These includes need to be later than dictated by the style guide due to
// Xlib header pollution, specifically the min, max, and Status macros.
diff --git a/media/base/user_input_monitor_win.cc b/media/base/user_input_monitor_win.cc
index bf923c7..13b826f 100644
--- a/media/base/user_input_monitor_win.cc
+++ b/media/base/user_input_monitor_win.cc
@@ -14,7 +14,7 @@
#include "base/win/message_window.h"
#include "media/base/keyboard_event_counter.h"
#include "third_party/skia/include/core/SkPoint.h"
-#include "ui/base/keycodes/keyboard_code_conversion_win.h"
+#include "ui/events/keycodes/keyboard_code_conversion_win.h"
namespace media {
namespace {
diff --git a/ppapi/examples/ime/ime.cc b/ppapi/examples/ime/ime.cc
index 2721519..0f3e41e 100644
--- a/ppapi/examples/ime/ime.cc
+++ b/ppapi/examples/ime/ime.cc
@@ -21,7 +21,7 @@
namespace {
-// Extracted from: ui/base/keycodes/keyboard_codes.h
+// Extracted from: ui/events/keycodes/keyboard_codes.h
enum {
VKEY_BACK = 0x08,
VKEY_SHIFT = 0x10,
diff --git a/remoting/client/jni/android_keymap.cc b/remoting/client/jni/android_keymap.cc
index 45d67c4..7f5653e 100644
--- a/remoting/client/jni/android_keymap.cc
+++ b/remoting/client/jni/android_keymap.cc
@@ -10,7 +10,7 @@ namespace {
// These must be defined in the same order as the Android keycodes in
// <android/keycodes.h> and
-// "ui/base/keycodes/keyboard_code_conversion_android.cc" . Some of these
+// "ui/events/keycodes/keyboard_code_conversion_android.cc" . Some of these
// mappings assume a US keyboard layout for now.
const uint32 usb_keycodes[] = {
0, // UNKNOWN
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"