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

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

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"

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 {
 

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 {

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 {
 

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 {

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;
 

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 {
 

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 {

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"
 

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"

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

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 {
 

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 {
 

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"

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 ---------------------------------------------------------

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 {

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"

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:

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"

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;
 

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 {
 

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"

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;

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 {
 

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"

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 {

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)

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;

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"

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"

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"

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"

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"

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;

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"

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"

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

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"

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"