Move app/key* to ui/base/keycodes/*

BUG=none
TEST=none
TBR=brettw

Review URL: http://codereview.chromium.org/6246001

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

31 files changed, 231 insertions, 231 deletions

diff --git a/chrome/browser/ui/cocoa/html_dialog_window_controller.mm b/chrome/browser/ui/cocoa/html_dialog_window_controller.mm
index 611ecdd..361579d 100644
--- a/chrome/browser/ui/cocoa/html_dialog_window_controller.mm
+++ b/chrome/browser/ui/cocoa/html_dialog_window_controller.mm
@@ -4,7 +4,6 @@
 
 #import "chrome/browser/ui/cocoa/html_dialog_window_controller.h"
 
-#include "app/keyboard_codes.h"
 #include "base/logging.h"
 #include "base/scoped_nsobject.h"
 #include "base/sys_string_conversions.h"
@@ -17,6 +16,7 @@
 #include "chrome/common/native_web_keyboard_event.h"
 #include "gfx/size.h"
 #include "ipc/ipc_message.h"
+#include "ui/base/keycodes/keyboard_codes.h"
 
 // Thin bridge that routes notifications to
 // HtmlDialogWindowController's member variables.
@@ -195,8 +195,8 @@ void HtmlDialogWindowDelegateBridge::HandleKeyboardEvent(
   // TODO(thakis): It would be nice to get cancel: to work somehow.
   // Bug: http://code.google.com/p/chromium/issues/detail?id=32828 .
   if (event.type == NativeWebKeyboardEvent::RawKeyDown &&
-      ((event.windowsKeyCode == app::VKEY_ESCAPE) ||
-       (event.windowsKeyCode == app::VKEY_OEM_PERIOD &&
+      ((event.windowsKeyCode == ui::VKEY_ESCAPE) ||
+       (event.windowsKeyCode == ui::VKEY_OEM_PERIOD &&
         event.modifiers == NativeWebKeyboardEvent::MetaKey))) {
     [controller_ close];
     return;
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 06a7b12..b673175 100644
--- a/chrome/browser/ui/find_bar/find_bar_host_browsertest.cc
+++ b/chrome/browser/ui/find_bar/find_bar_host_browsertest.cc
@@ -2,7 +2,6 @@
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
-#include "app/keyboard_codes.h"
 #include "base/message_loop.h"
 #include "base/string_util.h"
 #include "base/utf_string_conversions.h"
@@ -20,6 +19,7 @@
 #include "chrome/test/in_process_browser_test.h"
 #include "chrome/test/ui_test_utils.h"
 #include "net/test/test_server.h"
+#include "ui/base/keycodes/keyboard_codes.h"
 
 #if defined(TOOLKIT_VIEWS)
 #include "chrome/browser/ui/views/find_bar_host.h"
@@ -739,7 +739,7 @@ IN_PROC_BROWSER_TEST_F(FindInPageControllerTest,
           browser()->window()->GetNativeHandle());
 
   // See where Escape is registered.
-  views::Accelerator escape(app::VKEY_ESCAPE, false, false, false);
+  views::Accelerator escape(ui::VKEY_ESCAPE, false, false, false);
   views::AcceleratorTarget* old_target =
       focus_manager->GetCurrentTargetForAccelerator(escape);
   EXPECT_TRUE(old_target != NULL);
diff --git a/chrome/browser/ui/views/accelerator_table_gtk.cc b/chrome/browser/ui/views/accelerator_table_gtk.cc
index 5a3d0f7..025714b 100644
--- a/chrome/browser/ui/views/accelerator_table_gtk.cc
+++ b/chrome/browser/ui/views/accelerator_table_gtk.cc
@@ -4,9 +4,9 @@
 
 #include "chrome/browser/ui/views/accelerator_table_gtk.h"
 
-#include "app/keyboard_codes.h"
 #include "base/basictypes.h"
 #include "chrome/app/chrome_command_ids.h"
+#include "ui/base/keycodes/keyboard_codes.h"
 
 namespace browser {
 
@@ -14,144 +14,144 @@ namespace browser {
 // the Windows accelerators in ../../app/chrome_dll.rc.
 const AcceleratorMapping kAcceleratorMap[] = {
   // Keycode                  Shift  Ctrl   Alt    Command ID
-  { app::VKEY_A,              true,  true,  false, IDC_AUTOFILL_DEFAULT },
-  { app::VKEY_LEFT,           false, false, true,  IDC_BACK },
-  { app::VKEY_BACK,           false, false, false, IDC_BACK },
+  { ui::VKEY_A,              true,  true,  false, IDC_AUTOFILL_DEFAULT },
+  { ui::VKEY_LEFT,           false, false, true,  IDC_BACK },
+  { ui::VKEY_BACK,           false, false, false, IDC_BACK },
 #if defined(OS_CHROMEOS)
-  { app::VKEY_F1,             false, false, false, IDC_BACK },
+  { ui::VKEY_F1,             false, false, false, IDC_BACK },
   // TODO(mazda): Change VKEY_1 to VKEY_OME_2 once the new version of the
   // keyboard overlay is ready.
-  { app::VKEY_1,              false, true,  true,  IDC_SHOW_KEYBOARD_OVERLAY },
+  { ui::VKEY_1,              false, true,  true,  IDC_SHOW_KEYBOARD_OVERLAY },
 #endif
-  { app::VKEY_D,              false, true,  false, IDC_BOOKMARK_PAGE },
-  { app::VKEY_D,              true,  true,  false, IDC_BOOKMARK_ALL_TABS },
-  { app::VKEY_DELETE,         true,  true,  false, IDC_CLEAR_BROWSING_DATA },
+  { ui::VKEY_D,              false, true,  false, IDC_BOOKMARK_PAGE },
+  { ui::VKEY_D,              true,  true,  false, IDC_BOOKMARK_ALL_TABS },
+  { ui::VKEY_DELETE,         true,  true,  false, IDC_CLEAR_BROWSING_DATA },
 #if !defined(OS_CHROMEOS)
-  { app::VKEY_F4,             false, true,  false, IDC_CLOSE_TAB },
+  { ui::VKEY_F4,             false, true,  false, IDC_CLOSE_TAB },
 #endif
-  { app::VKEY_W,              false, true,  false, IDC_CLOSE_TAB },
-  { app::VKEY_W,              true,  true,  false, IDC_CLOSE_WINDOW },
+  { ui::VKEY_W,              false, true,  false, IDC_CLOSE_TAB },
+  { ui::VKEY_W,              true,  true,  false, IDC_CLOSE_WINDOW },
 #if !defined(OS_CHROMEOS)
-  { app::VKEY_F4,             false, false, true,  IDC_CLOSE_WINDOW },
+  { ui::VKEY_F4,             false, false, true,  IDC_CLOSE_WINDOW },
 #endif
-  { app::VKEY_Q,              true,  true,  false, IDC_EXIT },
-  { app::VKEY_F,              false, true,  false, IDC_FIND },
-  { app::VKEY_G,              false, true,  false, IDC_FIND_NEXT },
+  { ui::VKEY_Q,              true,  true,  false, IDC_EXIT },
+  { ui::VKEY_F,              false, true,  false, IDC_FIND },
+  { ui::VKEY_G,              false, true,  false, IDC_FIND_NEXT },
 #if !defined(OS_CHROMEOS)
-  { app::VKEY_F3,             false, false, false, IDC_FIND_NEXT },
+  { ui::VKEY_F3,             false, false, false, IDC_FIND_NEXT },
 #endif
-  { app::VKEY_G,              true,  true,  false, IDC_FIND_PREVIOUS },
+  { ui::VKEY_G,              true,  true,  false, IDC_FIND_PREVIOUS },
 #if !defined(OS_CHROMEOS)
-  { app::VKEY_F3,             true,  false, false, IDC_FIND_PREVIOUS },
+  { ui::VKEY_F3,             true,  false, false, IDC_FIND_PREVIOUS },
 #endif
 #if defined(OS_CHROMEOS)
-  { app::VKEY_S,              true,  false, true,  IDC_FOCUS_CHROMEOS_STATUS },
+  { ui::VKEY_S,              true,  false, true,  IDC_FOCUS_CHROMEOS_STATUS },
 #endif
-  { app::VKEY_D,              false, false, true,  IDC_FOCUS_LOCATION },
-  { app::VKEY_L,              false, true,  false, IDC_FOCUS_LOCATION },
+  { ui::VKEY_D,              false, false, true,  IDC_FOCUS_LOCATION },
+  { ui::VKEY_L,              false, true,  false, IDC_FOCUS_LOCATION },
 #if !defined(OS_CHROMEOS)
-  { app::VKEY_F10,            false, false, false, IDC_FOCUS_MENU_BAR },
+  { ui::VKEY_F10,            false, false, false, IDC_FOCUS_MENU_BAR },
 #endif
-  { app::VKEY_MENU,           false, false, false, IDC_FOCUS_MENU_BAR },
+  { ui::VKEY_MENU,           false, false, false, IDC_FOCUS_MENU_BAR },
 #if !defined(OS_CHROMEOS)
-  { app::VKEY_F6,             false, false, false, IDC_FOCUS_NEXT_PANE },
+  { ui::VKEY_F6,             false, false, false, IDC_FOCUS_NEXT_PANE },
 #endif
 #if defined(OS_CHROMEOS)
-  { app::VKEY_F2,             false, true,  false, IDC_FOCUS_NEXT_PANE },
+  { ui::VKEY_F2,             false, true,  false, IDC_FOCUS_NEXT_PANE },
 #endif
 #if !defined(OS_CHROMEOS)
-  { app::VKEY_F6,             true,  false, false, IDC_FOCUS_PREVIOUS_PANE },
+  { ui::VKEY_F6,             true,  false, false, IDC_FOCUS_PREVIOUS_PANE },
 #endif
 #if defined(OS_CHROMEOS)
-  { app::VKEY_F1,             false, true,  false, IDC_FOCUS_PREVIOUS_PANE },
-#endif
-  { app::VKEY_K,              false, true,  false, IDC_FOCUS_SEARCH },
-  { app::VKEY_E,              false, true,  false, IDC_FOCUS_SEARCH },
-  { app::VKEY_BROWSER_SEARCH, false, false, false, IDC_FOCUS_SEARCH },
-  { app::VKEY_T,              true,  false, true,  IDC_FOCUS_TOOLBAR },
-  { app::VKEY_B,              true,  false, true,  IDC_FOCUS_BOOKMARKS },
-  { app::VKEY_RIGHT,          false, false, true,  IDC_FORWARD },
-  { app::VKEY_BACK,           true,  false, false, IDC_FORWARD },
+  { ui::VKEY_F1,             false, true,  false, IDC_FOCUS_PREVIOUS_PANE },
+#endif
+  { ui::VKEY_K,              false, true,  false, IDC_FOCUS_SEARCH },
+  { ui::VKEY_E,              false, true,  false, IDC_FOCUS_SEARCH },
+  { ui::VKEY_BROWSER_SEARCH, false, false, false, IDC_FOCUS_SEARCH },
+  { ui::VKEY_T,              true,  false, true,  IDC_FOCUS_TOOLBAR },
+  { ui::VKEY_B,              true,  false, true,  IDC_FOCUS_BOOKMARKS },
+  { ui::VKEY_RIGHT,          false, false, true,  IDC_FORWARD },
+  { ui::VKEY_BACK,           true,  false, false, IDC_FORWARD },
 #if defined(OS_CHROMEOS)
-  { app::VKEY_F2,             false, false, false, IDC_FORWARD },
+  { ui::VKEY_F2,             false, false, false, IDC_FORWARD },
 #endif
 #if !defined(OS_CHROMEOS)
-  { app::VKEY_F11,            false, false, false, IDC_FULLSCREEN },
+  { ui::VKEY_F11,            false, false, false, IDC_FULLSCREEN },
 #endif
 #if defined(OS_CHROMEOS)
-  { app::VKEY_F4,             false, false, false, IDC_FULLSCREEN },
+  { ui::VKEY_F4,             false, false, false, IDC_FULLSCREEN },
 #endif
 #if !defined(OS_CHROMEOS)
-  { app::VKEY_F1,             false, false, false, IDC_HELP_PAGE },
+  { ui::VKEY_F1,             false, false, false, IDC_HELP_PAGE },
 #endif
 #if defined(OS_CHROMEOS)
-  { app::VKEY_OEM_2,          false, true,  false, IDC_HELP_PAGE },
-  { app::VKEY_OEM_2,          true,  true,  false, IDC_HELP_PAGE },
-#endif
-  { app::VKEY_I,              true,  true,  false, IDC_DEV_TOOLS },
-  { app::VKEY_J,              true,  true,  false, IDC_DEV_TOOLS_CONSOLE },
-  { app::VKEY_C,              true,  true,  false, IDC_DEV_TOOLS_INSPECT },
-  { app::VKEY_N,              true,  true,  false, IDC_NEW_INCOGNITO_WINDOW },
-  { app::VKEY_T,              false, true,  false, IDC_NEW_TAB },
-  { app::VKEY_N,              false, true,  false, IDC_NEW_WINDOW },
-  { app::VKEY_O,              false, true,  false, IDC_OPEN_FILE },
-  { app::VKEY_P,              false, true,  false, IDC_PRINT},
-  { app::VKEY_R,              false, true,  false, IDC_RELOAD },
-  { app::VKEY_R,              true,  true,  false, IDC_RELOAD_IGNORING_CACHE },
+  { ui::VKEY_OEM_2,          false, true,  false, IDC_HELP_PAGE },
+  { ui::VKEY_OEM_2,          true,  true,  false, IDC_HELP_PAGE },
+#endif
+  { ui::VKEY_I,              true,  true,  false, IDC_DEV_TOOLS },
+  { ui::VKEY_J,              true,  true,  false, IDC_DEV_TOOLS_CONSOLE },
+  { ui::VKEY_C,              true,  true,  false, IDC_DEV_TOOLS_INSPECT },
+  { ui::VKEY_N,              true,  true,  false, IDC_NEW_INCOGNITO_WINDOW },
+  { ui::VKEY_T,              false, true,  false, IDC_NEW_TAB },
+  { ui::VKEY_N,              false, true,  false, IDC_NEW_WINDOW },
+  { ui::VKEY_O,              false, true,  false, IDC_OPEN_FILE },
+  { ui::VKEY_P,              false, true,  false, IDC_PRINT},
+  { ui::VKEY_R,              false, true,  false, IDC_RELOAD },
+  { ui::VKEY_R,              true,  true,  false, IDC_RELOAD_IGNORING_CACHE },
 #if !defined(OS_CHROMEOS)
-  { app::VKEY_F5,             false, false, false, IDC_RELOAD },
-  { app::VKEY_F5,             false, true,  false, IDC_RELOAD_IGNORING_CACHE },
-  { app::VKEY_F5,             true,  false, false, IDC_RELOAD_IGNORING_CACHE },
+  { ui::VKEY_F5,             false, false, false, IDC_RELOAD },
+  { ui::VKEY_F5,             false, true,  false, IDC_RELOAD_IGNORING_CACHE },
+  { ui::VKEY_F5,             true,  false, false, IDC_RELOAD_IGNORING_CACHE },
 #endif
 #if defined(OS_CHROMEOS)
-  { app::VKEY_F3,             false, false, false, IDC_RELOAD },
-  { app::VKEY_F3,             false, true,  false, IDC_RELOAD_IGNORING_CACHE },
-  { app::VKEY_F3,             true,  false, false, IDC_RELOAD_IGNORING_CACHE },
+  { ui::VKEY_F3,             false, false, false, IDC_RELOAD },
+  { ui::VKEY_F3,             false, true,  false, IDC_RELOAD_IGNORING_CACHE },
+  { ui::VKEY_F3,             true,  false, false, IDC_RELOAD_IGNORING_CACHE },
 #endif
-  { app::VKEY_HOME,           false, false, true,  IDC_HOME },
-  { app::VKEY_T,              true,  true,  false, IDC_RESTORE_TAB },
-  { app::VKEY_S,              false, true,  false, IDC_SAVE_PAGE },
+  { ui::VKEY_HOME,           false, false, true,  IDC_HOME },
+  { ui::VKEY_T,              true,  true,  false, IDC_RESTORE_TAB },
+  { ui::VKEY_S,              false, true,  false, IDC_SAVE_PAGE },
 #if defined(OS_CHROMEOS)
-  { app::VKEY_LWIN,           false, false, false, IDC_SEARCH },
-#endif
-  { app::VKEY_9,              false, true,  false, IDC_SELECT_LAST_TAB },
-  { app::VKEY_NUMPAD9,        false, true,  false, IDC_SELECT_LAST_TAB },
-  { app::VKEY_TAB,            false, true,  false, IDC_SELECT_NEXT_TAB },
-  { app::VKEY_NEXT,           false, true,  false, IDC_SELECT_NEXT_TAB },
-  { app::VKEY_TAB,            true,  true,  false, IDC_SELECT_PREVIOUS_TAB },
-  { app::VKEY_PRIOR,          false, true,  false, IDC_SELECT_PREVIOUS_TAB },
-  { app::VKEY_1,              false, true,  false, IDC_SELECT_TAB_0 },
-  { app::VKEY_NUMPAD1,        false, true,  false, IDC_SELECT_TAB_0 },
-  { app::VKEY_2,              false, true,  false, IDC_SELECT_TAB_1 },
-  { app::VKEY_NUMPAD2,        false, true,  false, IDC_SELECT_TAB_1 },
-  { app::VKEY_3,              false, true,  false, IDC_SELECT_TAB_2 },
-  { app::VKEY_NUMPAD3,        false, true,  false, IDC_SELECT_TAB_2 },
-  { app::VKEY_4,              false, true,  false, IDC_SELECT_TAB_3 },
-  { app::VKEY_NUMPAD4,        false, true,  false, IDC_SELECT_TAB_3 },
-  { app::VKEY_5,              false, true,  false, IDC_SELECT_TAB_4 },
-  { app::VKEY_NUMPAD5,        false, true,  false, IDC_SELECT_TAB_4 },
-  { app::VKEY_6,              false, true,  false, IDC_SELECT_TAB_5 },
-  { app::VKEY_NUMPAD6,        false, true,  false, IDC_SELECT_TAB_5 },
-  { app::VKEY_7,              false, true,  false, IDC_SELECT_TAB_6 },
-  { app::VKEY_NUMPAD7,        false, true,  false, IDC_SELECT_TAB_6 },
-  { app::VKEY_8,              false, true,  false, IDC_SELECT_TAB_7 },
-  { app::VKEY_NUMPAD8,        false, true,  false, IDC_SELECT_TAB_7 },
-  { app::VKEY_B,              true,  true,  false, IDC_SHOW_BOOKMARK_BAR },
-  { app::VKEY_J,              false, true,  false, IDC_SHOW_DOWNLOADS },
-  { app::VKEY_H,              false, true,  false, IDC_SHOW_HISTORY },
-  { app::VKEY_F,              false, false, true,  IDC_SHOW_APP_MENU},
-  { app::VKEY_E,              false, false, true,  IDC_SHOW_APP_MENU},
-  { app::VKEY_ESCAPE,         false, false, false, IDC_STOP },
-  { app::VKEY_ESCAPE,         true,  false, false, IDC_TASK_MANAGER },
-  { app::VKEY_U,              false, true,  false, IDC_VIEW_SOURCE },
-  { app::VKEY_OEM_MINUS,      false, true,  false, IDC_ZOOM_MINUS },
-  { app::VKEY_OEM_MINUS,      true,  true,  false, IDC_ZOOM_MINUS },
-  { app::VKEY_SUBTRACT,       false, true,  false, IDC_ZOOM_MINUS },
-  { app::VKEY_0,              false, true,  false, IDC_ZOOM_NORMAL },
-  { app::VKEY_NUMPAD0,        false, true,  false, IDC_ZOOM_NORMAL },
-  { app::VKEY_OEM_PLUS,       false, true,  false, IDC_ZOOM_PLUS },
-  { app::VKEY_OEM_PLUS,       true,  true,  false, IDC_ZOOM_PLUS },
-  { app::VKEY_ADD,            false, true,  false, IDC_ZOOM_PLUS },
+  { ui::VKEY_LWIN,           false, false, false, IDC_SEARCH },
+#endif
+  { ui::VKEY_9,              false, true,  false, IDC_SELECT_LAST_TAB },
+  { ui::VKEY_NUMPAD9,        false, true,  false, IDC_SELECT_LAST_TAB },
+  { ui::VKEY_TAB,            false, true,  false, IDC_SELECT_NEXT_TAB },
+  { ui::VKEY_NEXT,           false, true,  false, IDC_SELECT_NEXT_TAB },
+  { ui::VKEY_TAB,            true,  true,  false, IDC_SELECT_PREVIOUS_TAB },
+  { ui::VKEY_PRIOR,          false, true,  false, IDC_SELECT_PREVIOUS_TAB },
+  { ui::VKEY_1,              false, true,  false, IDC_SELECT_TAB_0 },
+  { ui::VKEY_NUMPAD1,        false, true,  false, IDC_SELECT_TAB_0 },
+  { ui::VKEY_2,              false, true,  false, IDC_SELECT_TAB_1 },
+  { ui::VKEY_NUMPAD2,        false, true,  false, IDC_SELECT_TAB_1 },
+  { ui::VKEY_3,              false, true,  false, IDC_SELECT_TAB_2 },
+  { ui::VKEY_NUMPAD3,        false, true,  false, IDC_SELECT_TAB_2 },
+  { ui::VKEY_4,              false, true,  false, IDC_SELECT_TAB_3 },
+  { ui::VKEY_NUMPAD4,        false, true,  false, IDC_SELECT_TAB_3 },
+  { ui::VKEY_5,              false, true,  false, IDC_SELECT_TAB_4 },
+  { ui::VKEY_NUMPAD5,        false, true,  false, IDC_SELECT_TAB_4 },
+  { ui::VKEY_6,              false, true,  false, IDC_SELECT_TAB_5 },
+  { ui::VKEY_NUMPAD6,        false, true,  false, IDC_SELECT_TAB_5 },
+  { ui::VKEY_7,              false, true,  false, IDC_SELECT_TAB_6 },
+  { ui::VKEY_NUMPAD7,        false, true,  false, IDC_SELECT_TAB_6 },
+  { ui::VKEY_8,              false, true,  false, IDC_SELECT_TAB_7 },
+  { ui::VKEY_NUMPAD8,        false, true,  false, IDC_SELECT_TAB_7 },
+  { ui::VKEY_B,              true,  true,  false, IDC_SHOW_BOOKMARK_BAR },
+  { ui::VKEY_J,              false, true,  false, IDC_SHOW_DOWNLOADS },
+  { ui::VKEY_H,              false, true,  false, IDC_SHOW_HISTORY },
+  { ui::VKEY_F,              false, false, true,  IDC_SHOW_APP_MENU},
+  { ui::VKEY_E,              false, false, true,  IDC_SHOW_APP_MENU},
+  { ui::VKEY_ESCAPE,         false, false, false, IDC_STOP },
+  { ui::VKEY_ESCAPE,         true,  false, false, IDC_TASK_MANAGER },
+  { ui::VKEY_U,              false, true,  false, IDC_VIEW_SOURCE },
+  { ui::VKEY_OEM_MINUS,      false, true,  false, IDC_ZOOM_MINUS },
+  { ui::VKEY_OEM_MINUS,      true,  true,  false, IDC_ZOOM_MINUS },
+  { ui::VKEY_SUBTRACT,       false, true,  false, IDC_ZOOM_MINUS },
+  { ui::VKEY_0,              false, true,  false, IDC_ZOOM_NORMAL },
+  { ui::VKEY_NUMPAD0,        false, true,  false, IDC_ZOOM_NORMAL },
+  { ui::VKEY_OEM_PLUS,       false, true,  false, IDC_ZOOM_PLUS },
+  { ui::VKEY_OEM_PLUS,       true,  true,  false, IDC_ZOOM_PLUS },
+  { ui::VKEY_ADD,            false, true,  false, IDC_ZOOM_PLUS },
 };
 
 const size_t kAcceleratorMapLength = arraysize(kAcceleratorMap);
diff --git a/chrome/browser/ui/views/accelerator_table_gtk.h b/chrome/browser/ui/views/accelerator_table_gtk.h
index 4b38144..865db16 100644
--- a/chrome/browser/ui/views/accelerator_table_gtk.h
+++ b/chrome/browser/ui/views/accelerator_table_gtk.h
@@ -8,14 +8,14 @@
 
 #include <stdio.h>
 
-#include "app/keyboard_codes.h"
+#include "ui/base/keycodes/keyboard_codes.h"
 
 // This contains the list of accelerators for the Linux toolkit_view
 // implementation.
 namespace browser {
 
   struct AcceleratorMapping {
-    app::KeyboardCode keycode;
+    ui::KeyboardCode keycode;
     bool shift_pressed;
     bool ctrl_pressed;
     bool alt_pressed;
diff --git a/chrome/browser/ui/views/accessible_pane_view.cc b/chrome/browser/ui/views/accessible_pane_view.cc
index 1e07d1d..07b7a37 100644
--- a/chrome/browser/ui/views/accessible_pane_view.cc
+++ b/chrome/browser/ui/views/accessible_pane_view.cc
@@ -18,11 +18,11 @@ AccessiblePaneView::AccessiblePaneView()
     : pane_has_focus_(false),
       ALLOW_THIS_IN_INITIALIZER_LIST(method_factory_(this)),
       focus_manager_(NULL),
-      home_key_(app::VKEY_HOME, false, false, false),
-      end_key_(app::VKEY_END, false, false, false),
-      escape_key_(app::VKEY_ESCAPE, false, false, false),
-      left_key_(app::VKEY_LEFT, false, false, false),
-      right_key_(app::VKEY_RIGHT, false, false, false),
+      home_key_(ui::VKEY_HOME, false, false, false),
+      end_key_(ui::VKEY_END, false, false, false),
+      escape_key_(ui::VKEY_ESCAPE, false, false, false),
+      left_key_(ui::VKEY_LEFT, false, false, false),
+      right_key_(ui::VKEY_RIGHT, false, false, false),
       last_focused_view_storage_id_(-1) {
   focus_search_.reset(new views::FocusSearch(this, true, true));
 }
@@ -161,21 +161,21 @@ bool AccessiblePaneView::AcceleratorPressed(
   }
 
   switch (accelerator.GetKeyCode()) {
-    case app::VKEY_ESCAPE:
+    case ui::VKEY_ESCAPE:
       RemovePaneFocus();
       RestoreLastFocusedView();
       return true;
-    case app::VKEY_LEFT:
+    case ui::VKEY_LEFT:
       focus_manager_->AdvanceFocus(true);
       return true;
-    case app::VKEY_RIGHT:
+    case ui::VKEY_RIGHT:
       focus_manager_->AdvanceFocus(false);
       return true;
-    case app::VKEY_HOME:
+    case ui::VKEY_HOME:
       focus_manager_->SetFocusedViewWithReason(
           GetFirstFocusableChild(), views::FocusManager::kReasonFocusTraversal);
       return true;
-    case app::VKEY_END:
+    case ui::VKEY_END:
       focus_manager_->SetFocusedViewWithReason(
           GetLastFocusableChild(), views::FocusManager::kReasonFocusTraversal);
       return true;
diff --git a/chrome/browser/ui/views/bookmark_bar_view_test.cc b/chrome/browser/ui/views/bookmark_bar_view_test.cc
index bc1253c..b360363 100644
--- a/chrome/browser/ui/views/bookmark_bar_view_test.cc
+++ b/chrome/browser/ui/views/bookmark_bar_view_test.cc
@@ -2,7 +2,6 @@
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
-#include "app/keyboard_codes.h"
 #include "base/string_number_conversions.h"
 #include "base/utf_string_conversions.h"
 #include "chrome/app/chrome_command_ids.h"
@@ -20,6 +19,7 @@
 #include "chrome/test/ui_test_utils.h"
 #include "grit/generated_resources.h"
 #include "ui/base/clipboard/clipboard.h"
+#include "ui/base/keycodes/keyboard_codes.h"
 #include "views/controls/button/menu_button.h"
 #include "views/controls/button/text_button.h"
 #include "views/controls/menu/menu_controller.h"
@@ -882,7 +882,7 @@ class BookmarkBarViewTest10 : public BookmarkBarViewEventTestBase {
 
     // Send a down event, which should select the first item.
     ui_controls::SendKeyPressNotifyWhenDone(
-        NULL, app::VKEY_DOWN, false, false, false, false,
+        NULL, ui::VKEY_DOWN, false, false, false, false,
         CreateEventTask(this, &BookmarkBarViewTest10::Step3));
   }
 
@@ -895,7 +895,7 @@ class BookmarkBarViewTest10 : public BookmarkBarViewEventTestBase {
 
     // Send a key down event, which should select the next item.
     ui_controls::SendKeyPressNotifyWhenDone(
-        NULL, app::VKEY_DOWN, false, false, false, false,
+        NULL, ui::VKEY_DOWN, false, false, false, false,
         CreateEventTask(this, &BookmarkBarViewTest10::Step4));
   }
 
@@ -908,7 +908,7 @@ class BookmarkBarViewTest10 : public BookmarkBarViewEventTestBase {
 
     // Send a right arrow to force the menu to open.
     ui_controls::SendKeyPressNotifyWhenDone(
-        NULL, app::VKEY_RIGHT, false, false, false, false,
+        NULL, ui::VKEY_RIGHT, false, false, false, false,
         CreateEventTask(this, &BookmarkBarViewTest10::Step5));
   }
 
@@ -924,7 +924,7 @@ class BookmarkBarViewTest10 : public BookmarkBarViewEventTestBase {
 
     // Send a left arrow to close the submenu.
     ui_controls::SendKeyPressNotifyWhenDone(
-        NULL, app::VKEY_LEFT, false, false, false, false,
+        NULL, ui::VKEY_LEFT, false, false, false, false,
         CreateEventTask(this, &BookmarkBarViewTest10::Step6));
   }
 
@@ -939,7 +939,7 @@ class BookmarkBarViewTest10 : public BookmarkBarViewEventTestBase {
 
     // Send a down arrow to wrap back to f1a
     ui_controls::SendKeyPressNotifyWhenDone(
-        NULL, app::VKEY_DOWN, false, false, false, false,
+        NULL, ui::VKEY_DOWN, false, false, false, false,
         CreateEventTask(this, &BookmarkBarViewTest10::Step7));
   }
 
@@ -952,7 +952,7 @@ class BookmarkBarViewTest10 : public BookmarkBarViewEventTestBase {
 
     // Send enter, which should select the item.
     ui_controls::SendKeyPressNotifyWhenDone(
-        NULL, app::VKEY_RETURN, false, false, false, false,
+        NULL, ui::VKEY_RETURN, false, false, false, false,
         CreateEventTask(this, &BookmarkBarViewTest10::Step8));
   }
 
@@ -1007,7 +1007,7 @@ class BookmarkBarViewTest11 : public BookmarkBarViewEventTestBase {
   void Step3() {
     // Send escape so that the context menu hides.
     ui_controls::SendKeyPressNotifyWhenDone(
-        NULL, app::VKEY_ESCAPE, false, false, false, false,
+        NULL, ui::VKEY_ESCAPE, false, false, false, false,
         CreateEventTask(this, &BookmarkBarViewTest11::Step4));
   }
 
@@ -1096,7 +1096,7 @@ class BookmarkBarViewTest12 : public BookmarkBarViewEventTestBase {
 
   void Step4() {
     // Press tab to give focus to the cancel button.
-    ui_controls::SendKeyPress(NULL, app::VKEY_TAB, false, false, false, false);
+    ui_controls::SendKeyPress(NULL, ui::VKEY_TAB, false, false, false, false);
 
     // For some reason return isn't processed correctly unless we delay.
     MessageLoop::current()->PostDelayedTask(FROM_HERE,
@@ -1106,7 +1106,7 @@ class BookmarkBarViewTest12 : public BookmarkBarViewEventTestBase {
   void Step5() {
     // And press enter so that the cancel button is selected.
     ui_controls::SendKeyPressNotifyWhenDone(
-        NULL, app::VKEY_RETURN, false, false, false, false,
+        NULL, ui::VKEY_RETURN, false, false, false, false,
         CreateEventTask(this, &BookmarkBarViewTest12::Step6));
   }
 
@@ -1235,7 +1235,7 @@ class BookmarkBarViewTest14 : public BookmarkBarViewEventTestBase {
 
     // Send escape so that the context menu hides.
     ui_controls::SendKeyPressNotifyWhenDone(
-        NULL, app::VKEY_ESCAPE, false, false, false, false,
+        NULL, ui::VKEY_ESCAPE, false, false, false, false,
         CreateEventTask(this, &BookmarkBarViewTest14::Step3));
   }
 
diff --git a/chrome/browser/ui/views/bookmark_bubble_view.cc b/chrome/browser/ui/views/bookmark_bubble_view.cc
index 2f33f1f..1a6e3b6 100644
--- a/chrome/browser/ui/views/bookmark_bubble_view.cc
+++ b/chrome/browser/ui/views/bookmark_bubble_view.cc
@@ -4,7 +4,6 @@
 
 #include "chrome/browser/ui/views/bookmark_bubble_view.h"
 
-#include "app/keyboard_codes.h"
 #include "app/l10n_util.h"
 #include "app/resource_bundle.h"
 #include "base/string16.h"
@@ -22,6 +21,7 @@
 #include "gfx/color_utils.h"
 #include "grit/generated_resources.h"
 #include "grit/theme_resources.h"
+#include "ui/base/keycodes/keyboard_codes.h"
 #include "views/event.h"
 #include "views/standard_layout.h"
 #include "views/controls/button/native_button.h"
@@ -138,7 +138,7 @@ void BookmarkBubbleView::DidChangeBounds(const gfx::Rect& previous,
 void BookmarkBubbleView::BubbleShown() {
   DCHECK(GetWidget());
   GetFocusManager()->RegisterAccelerator(
-      views::Accelerator(app::VKEY_RETURN, false, false, false), this);
+      views::Accelerator(ui::VKEY_RETURN, false, false, false), this);
 
   title_tf_->RequestFocus();
   title_tf_->SelectAll();
@@ -146,7 +146,7 @@ void BookmarkBubbleView::BubbleShown() {
 
 bool BookmarkBubbleView::AcceleratorPressed(
     const views::Accelerator& accelerator) {
-  if (accelerator.GetKeyCode() != app::VKEY_RETURN)
+  if (accelerator.GetKeyCode() != ui::VKEY_RETURN)
     return false;
 
   if (edit_button_->HasFocus())
diff --git a/chrome/browser/ui/views/browser_keyboard_accessibility_test_win.cc b/chrome/browser/ui/views/browser_keyboard_accessibility_test_win.cc
index 0c31a5b..adbeaaf 100644
--- a/chrome/browser/ui/views/browser_keyboard_accessibility_test_win.cc
+++ b/chrome/browser/ui/views/browser_keyboard_accessibility_test_win.cc
@@ -2,12 +2,12 @@
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
-#include "app/keyboard_codes.h"
 #include "chrome/browser/automation/ui_controls.h"
 #include "chrome/browser/ui/views/chrome_views_delegate.h"
 #include "chrome/browser/ui/views/frame/browser_view.h"
 #include "chrome/test/in_process_browser_test.h"
 #include "chrome/test/ui_test_utils.h"
+#include "ui/base/keycodes/keyboard_codes.h"
 #include "views/view.h"
 #include "views/accessibility/view_accessibility.h"
 #include "views/widget/widget.h"
@@ -119,7 +119,7 @@ IN_PROC_BROWSER_TEST_F(BrowserKeyboardAccessibility,
     // TODO(phajdan.jr): remove logging after fixing http://crbug.com/50663.
     LOG(ERROR) << "Sending TAB key event...";
     ui_controls::SendKeyPressNotifyWhenDone(current_view_native_window(),
-                                            app::VKEY_TAB,
+                                            ui::VKEY_TAB,
                                             true, false, false, false,
                                             new MessageLoop::QuitTask());
     set_waiting(true);
@@ -153,7 +153,7 @@ IN_PROC_BROWSER_TEST_F(BrowserKeyboardAccessibility,
                        DISABLED_TabInToolbar) {
   gfx::NativeWindow native_window = browser()->window()->GetNativeHandle();
   ui_controls::SendKeyPressNotifyWhenDone(native_window,
-                                          app::VKEY_T,
+                                          ui::VKEY_T,
                                           false, true, true, false,
                                           new MessageLoop::QuitTask());
   set_waiting(true);
@@ -197,7 +197,7 @@ void BrowserKeyboardAccessibility::TabCycler(gfx::NativeWindow hwnd,
   do {
     // TODO(phajdan.jr): remove logging after fixing http://crbug.com/50663.
     LOG(ERROR) << "Sending TAB key event.";
-    ui_controls::SendKeyPressNotifyWhenDone(hwnd, app::VKEY_TAB,
+    ui_controls::SendKeyPressNotifyWhenDone(hwnd, ui::VKEY_TAB,
         false, !forward_tab, false, false, new MessageLoop::QuitTask());
     set_waiting(true);
     ui_test_utils::RunMessageLoop();
diff --git a/chrome/browser/ui/views/download_item_view.cc b/chrome/browser/ui/views/download_item_view.cc
index d35725b..f09cb48 100644
--- a/chrome/browser/ui/views/download_item_view.cc
+++ b/chrome/browser/ui/views/download_item_view.cc
@@ -876,8 +876,8 @@ bool DownloadItemView::OnKeyPressed(const views::KeyEvent& e) {
   if (IsDangerousMode())
     return true;
 
-  if (e.GetKeyCode() == app::VKEY_SPACE ||
-      e.GetKeyCode() == app::VKEY_RETURN) {
+  if (e.GetKeyCode() == ui::VKEY_SPACE ||
+      e.GetKeyCode() == ui::VKEY_RETURN) {
     OpenDownload();
     return true;
   }
diff --git a/chrome/browser/ui/views/dropdown_bar_host.cc b/chrome/browser/ui/views/dropdown_bar_host.cc
index e181565f..7933b39 100644
--- a/chrome/browser/ui/views/dropdown_bar_host.cc
+++ b/chrome/browser/ui/views/dropdown_bar_host.cc
@@ -4,7 +4,6 @@
 
 #include "chrome/browser/ui/views/dropdown_bar_host.h"
 
-#include "app/keyboard_codes.h"
 #include "chrome/browser/ui/browser.h"
 #include "chrome/browser/ui/view_ids.h"
 #include "chrome/browser/ui/views/dropdown_bar_view.h"
@@ -12,6 +11,7 @@
 #include "gfx/path.h"
 #include "gfx/scrollbar_size.h"
 #include "ui/base/animation/slide_animation.h"
+#include "ui/base/keycodes/keyboard_codes.h"
 #include "views/focus/external_focus_tracker.h"
 #include "views/focus/view_storage.h"
 #include "views/widget/widget.h"
@@ -305,14 +305,14 @@ void DropdownBarHost::UpdateWindowEdges(const gfx::Rect& new_pos) {
 
 void DropdownBarHost::RegisterAccelerators() {
   DCHECK(!esc_accel_target_registered_);
-  views::Accelerator escape(app::VKEY_ESCAPE, false, false, false);
+  views::Accelerator escape(ui::VKEY_ESCAPE, false, false, false);
   focus_manager_->RegisterAccelerator(escape, this);
   esc_accel_target_registered_ = true;
 }
 
 void DropdownBarHost::UnregisterAccelerators() {
   DCHECK(esc_accel_target_registered_);
-  views::Accelerator escape(app::VKEY_ESCAPE, false, false, false);
+  views::Accelerator escape(ui::VKEY_ESCAPE, false, false, false);
   focus_manager_->UnregisterAccelerator(escape, this);
   esc_accel_target_registered_ = false;
 }
diff --git a/chrome/browser/ui/views/dropdown_bar_host_gtk.cc b/chrome/browser/ui/views/dropdown_bar_host_gtk.cc
index 763caa4..022a201 100644
--- a/chrome/browser/ui/views/dropdown_bar_host_gtk.cc
+++ b/chrome/browser/ui/views/dropdown_bar_host_gtk.cc
@@ -12,7 +12,7 @@
 #include "views/controls/textfield/textfield.h"
 
 #if defined(TOUCH_UI)
-#include "app/keyboard_code_conversion_gtk.h"
+#include "ui/base/keycodes/keyboard_code_conversion_gtk.h"
 #endif
 
 views::Widget* DropdownBarHost::CreateHost() {
diff --git a/chrome/browser/ui/views/dropdown_bar_host_win.cc b/chrome/browser/ui/views/dropdown_bar_host_win.cc
index 99d12a9..f08db1d 100644
--- a/chrome/browser/ui/views/dropdown_bar_host_win.cc
+++ b/chrome/browser/ui/views/dropdown_bar_host_win.cc
@@ -4,12 +4,12 @@
 
 #include "chrome/browser/ui/views/dropdown_bar_host.h"
 
-#include "app/keyboard_code_conversion_win.h"
 #include "chrome/browser/renderer_host/render_view_host.h"
 #include "chrome/browser/tab_contents/tab_contents.h"
 #include "chrome/browser/tab_contents/tab_contents_view.h"
 #include "chrome/browser/ui/find_bar/find_bar_controller.h"
 #include "chrome/browser/ui/views/frame/browser_view.h"
+#include "ui/base/keycodes/keyboard_code_conversion_win.h"
 #include "views/controls/scrollbar/native_scroll_bar.h"
 #include "views/widget/widget_win.h"
 
diff --git a/chrome/browser/ui/views/extensions/extension_view.cc b/chrome/browser/ui/views/extensions/extension_view.cc
index f34b6ad..8fc7cde 100644
--- a/chrome/browser/ui/views/extensions/extension_view.cc
+++ b/chrome/browser/ui/views/extensions/extension_view.cc
@@ -180,7 +180,7 @@ void ExtensionView::PreferredSizeChanged() {
 bool ExtensionView::SkipDefaultKeyEventProcessing(const views::KeyEvent& e) {
   // Let the tab key event be processed by the renderer (instead of moving the
   // focus to the next focusable view).
-  return (e.GetKeyCode() == app::VKEY_TAB);
+  return (e.GetKeyCode() == ui::VKEY_TAB);
 }
 
 void ExtensionView::HandleMouseMove() {
diff --git a/chrome/browser/ui/views/find_bar_host.cc b/chrome/browser/ui/views/find_bar_host.cc
index ba2de8e..bfd74e3 100644
--- a/chrome/browser/ui/views/find_bar_host.cc
+++ b/chrome/browser/ui/views/find_bar_host.cc
@@ -4,7 +4,6 @@
 
 #include "chrome/browser/ui/views/find_bar_host.h"
 
-#include "app/keyboard_codes.h"
 #include "chrome/browser/renderer_host/render_view_host.h"
 #include "chrome/browser/tab_contents/tab_contents.h"
 #include "chrome/browser/tab_contents/tab_contents_view.h"
@@ -13,6 +12,7 @@
 #include "chrome/browser/ui/view_ids.h"
 #include "chrome/browser/ui/views/find_bar_view.h"
 #include "chrome/browser/ui/views/frame/browser_view.h"
+#include "ui/base/keycodes/keyboard_codes.h"
 #include "views/focus/external_focus_tracker.h"
 #include "views/focus/view_storage.h"
 #include "views/widget/root_view.h"
@@ -47,13 +47,13 @@ bool FindBarHost::MaybeForwardKeyEventToWebpage(
   }
 
   switch (key_event.GetKeyCode()) {
-    case app::VKEY_DOWN:
-    case app::VKEY_UP:
-    case app::VKEY_PRIOR:
-    case app::VKEY_NEXT:
+    case ui::VKEY_DOWN:
+    case ui::VKEY_UP:
+    case ui::VKEY_PRIOR:
+    case ui::VKEY_NEXT:
       break;
-    case app::VKEY_HOME:
-    case app::VKEY_END:
+    case ui::VKEY_HOME:
+    case ui::VKEY_END:
       if (key_event.IsControlDown())
         break;
     // Fall through.
@@ -164,11 +164,11 @@ FindBarTesting* FindBarHost::GetFindBarTesting() {
 // FindBarWin, views::AcceleratorTarget implementation:
 
 bool FindBarHost::AcceleratorPressed(const views::Accelerator& accelerator) {
-  app::KeyboardCode key = accelerator.GetKeyCode();
-  if (key == app::VKEY_RETURN && accelerator.IsCtrlDown()) {
+  ui::KeyboardCode key = accelerator.GetKeyCode();
+  if (key == ui::VKEY_RETURN && accelerator.IsCtrlDown()) {
     // Ctrl+Enter closes the Find session and navigates any link that is active.
     find_bar_controller_->EndFindSession(FindBarController::kActivateSelection);
-  } else if (key == app::VKEY_ESCAPE) {
+  } else if (key == ui::VKEY_ESCAPE) {
     // This will end the Find session and hide the window, causing it to loose
     // focus and in the process unregister us as the handler for the Escape
     // accelerator through the FocusWillChange event.
@@ -288,13 +288,13 @@ void FindBarHost::RegisterAccelerators() {
   DropdownBarHost::RegisterAccelerators();
 
   // Register for Ctrl+Return.
-  views::Accelerator escape(app::VKEY_RETURN, false, true, false);
+  views::Accelerator escape(ui::VKEY_RETURN, false, true, false);
   focus_manager()->RegisterAccelerator(escape, this);
 }
 
 void FindBarHost::UnregisterAccelerators() {
   // Unregister Ctrl+Return.
-  views::Accelerator escape(app::VKEY_RETURN, false, true, false);
+  views::Accelerator escape(ui::VKEY_RETURN, false, true, false);
   focus_manager()->UnregisterAccelerator(escape, this);
 
   DropdownBarHost::UnregisterAccelerators();
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 cb3d364..8a3c402 100644
--- a/chrome/browser/ui/views/find_bar_host_interactive_uitest.cc
+++ b/chrome/browser/ui/views/find_bar_host_interactive_uitest.cc
@@ -2,7 +2,6 @@
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
-#include "app/keyboard_codes.h"
 #include "base/process_util.h"
 #include "base/string_util.h"
 #include "base/utf_string_conversions.h"
@@ -16,6 +15,7 @@
 #include "chrome/test/in_process_browser_test.h"
 #include "chrome/test/ui_test_utils.h"
 #include "net/test/test_server.h"
+#include "ui/base/keycodes/keyboard_codes.h"
 #include "views/focus/focus_manager.h"
 #include "views/view.h"
 
@@ -73,7 +73,7 @@ IN_PROC_BROWSER_TEST_F(FindInPageTest, CrashEscHandlers) {
 
   // This used to crash until bug 1303709 was fixed.
   ASSERT_TRUE(ui_test_utils::SendKeyPressSync(
-      browser(), app::VKEY_ESCAPE, false, false, false, false));
+      browser(), ui::VKEY_ESCAPE, false, false, false, false));
 }
 
 IN_PROC_BROWSER_TEST_F(FindInPageTest, FocusRestore) {
@@ -192,21 +192,21 @@ IN_PROC_BROWSER_TEST_F(FindInPageTest, PrepopulateRespectBlank) {
 
   // Search for "a".
   ASSERT_TRUE(ui_test_utils::SendKeyPressSync(
-      browser(), app::VKEY_A, false, false, false, false));
+      browser(), ui::VKEY_A, false, false, false, false));
 
   // We should find "a" here.
   EXPECT_EQ(ASCIIToUTF16("a"), GetFindBarText());
 
   // Delete "a".
   ASSERT_TRUE(ui_test_utils::SendKeyPressSync(
-      browser(), app::VKEY_BACK, false, false, false, false));
+      browser(), ui::VKEY_BACK, false, false, false, false));
 
   // Validate we have cleared the text.
   EXPECT_EQ(string16(), GetFindBarText());
 
   // Close the Find box.
   ASSERT_TRUE(ui_test_utils::SendKeyPressSync(
-      browser(), app::VKEY_ESCAPE, false, false, false, false));
+      browser(), ui::VKEY_ESCAPE, false, false, false, false));
 
   // Show the Find bar.
   browser()->GetFindBarController()->Show();
@@ -217,11 +217,11 @@ IN_PROC_BROWSER_TEST_F(FindInPageTest, PrepopulateRespectBlank) {
 
   // Close the Find box.
   ASSERT_TRUE(ui_test_utils::SendKeyPressSync(
-      browser(), app::VKEY_ESCAPE, false, false, false, false));
+      browser(), ui::VKEY_ESCAPE, false, false, false, false));
 
   // Press F3 to trigger FindNext.
   ASSERT_TRUE(ui_test_utils::SendKeyPressSync(
-      browser(), app::VKEY_F3, false, false, false, false));
+      browser(), ui::VKEY_F3, false, false, false, false));
 
   // After the Find box has been reopened, it should still have no prepopulate
   // value.
diff --git a/chrome/browser/ui/views/find_bar_view.cc b/chrome/browser/ui/views/find_bar_view.cc
index 5b643fd..4272634 100644
--- a/chrome/browser/ui/views/find_bar_view.cc
+++ b/chrome/browser/ui/views/find_bar_view.cc
@@ -512,7 +512,7 @@ bool FindBarView::HandleKeyEvent(views::Textfield* sender,
   if (find_bar_host()->MaybeForwardKeyEventToWebpage(key_event))
     return true;  // Handled, we are done!
 
-  if (key_event.GetKeyCode() == app::VKEY_RETURN) {
+  if (key_event.GetKeyCode() == ui::VKEY_RETURN) {
     // Pressing Return/Enter starts the search (unless text box is empty).
     string16 find_string = find_text_->text();
     if (!find_string.empty()) {
diff --git a/chrome/browser/ui/views/frame/browser_view.cc b/chrome/browser/ui/views/frame/browser_view.cc
index a52745b..4ba5d41 100644
--- a/chrome/browser/ui/views/frame/browser_view.cc
+++ b/chrome/browser/ui/views/frame/browser_view.cc
@@ -620,13 +620,13 @@ bool BrowserView::GetAccelerator(int cmd_id, menus::Accelerator* accelerator) {
   // anywhere so we need to check for them explicitly here.
   switch (cmd_id) {
     case IDC_CUT:
-      *accelerator = views::Accelerator(app::VKEY_X, false, true, false);
+      *accelerator = views::Accelerator(ui::VKEY_X, false, true, false);
       return true;
     case IDC_COPY:
-      *accelerator = views::Accelerator(app::VKEY_C, false, true, false);
+      *accelerator = views::Accelerator(ui::VKEY_C, false, true, false);
       return true;
     case IDC_PASTE:
-      *accelerator = views::Accelerator(app::VKEY_V, false, true, false);
+      *accelerator = views::Accelerator(ui::VKEY_V, false, true, false);
       return true;
   }
   // Else, we retrieve the accelerator information from the accelerator table.
@@ -1213,7 +1213,7 @@ bool BrowserView::PreHandleKeyboardEvent(const NativeWebKeyboardEvent& event,
 #if defined(OS_WIN)
   // As Alt+F4 is the close-app keyboard shortcut, it needs processing
   // immediately.
-  if (event.windowsKeyCode == app::VKEY_F4 &&
+  if (event.windowsKeyCode == ui::VKEY_F4 &&
       event.modifiers == NativeWebKeyboardEvent::AltKey) {
     DefWindowProc(event.os_event.hwnd, event.os_event.message,
                   event.os_event.wParam, event.os_event.lParam);
@@ -1238,7 +1238,7 @@ bool BrowserView::PreHandleKeyboardEvent(const NativeWebKeyboardEvent& event,
                                  views_event.IsAltDown());
 #else
   views::Accelerator accelerator(
-      static_cast<app::KeyboardCode>(event.windowsKeyCode),
+      static_cast<ui::KeyboardCode>(event.windowsKeyCode),
       (event.modifiers & NativeWebKeyboardEvent::ShiftKey) ==
           NativeWebKeyboardEvent::ShiftKey,
       (event.modifiers & NativeWebKeyboardEvent::ControlKey) ==
@@ -1306,34 +1306,34 @@ void BrowserView::HandleKeyboardEvent(const NativeWebKeyboardEvent& event) {
 // manager to do that.
 #if !defined(OS_MACOSX)
 void BrowserView::Cut() {
-  ui_controls::SendKeyPress(GetNativeHandle(), app::VKEY_X,
+  ui_controls::SendKeyPress(GetNativeHandle(), ui::VKEY_X,
                             true, false, false, false);
 }
 
 void BrowserView::Copy() {
-  ui_controls::SendKeyPress(GetNativeHandle(), app::VKEY_C,
+  ui_controls::SendKeyPress(GetNativeHandle(), ui::VKEY_C,
                             true, false, false, false);
 }
 
 void BrowserView::Paste() {
-  ui_controls::SendKeyPress(GetNativeHandle(), app::VKEY_V,
+  ui_controls::SendKeyPress(GetNativeHandle(), ui::VKEY_V,
                             true, false, false, false);
 }
 #else
 // Mac versions.  Not tested by antyhing yet;
 // don't assume written == works.
 void BrowserView::Cut() {
-  ui_controls::SendKeyPress(GetNativeHandle(), app::VKEY_X,
+  ui_controls::SendKeyPress(GetNativeHandle(), ui::VKEY_X,
                             false, false, false, true);
 }
 
 void BrowserView::Copy() {
-  ui_controls::SendKeyPress(GetNativeHandle(), app::VKEY_C,
+  ui_controls::SendKeyPress(GetNativeHandle(), ui::VKEY_C,
                             false, false, false, true);
 }
 
 void BrowserView::Paste() {
-  ui_controls::SendKeyPress(GetNativeHandle(), app::VKEY_V,
+  ui_controls::SendKeyPress(GetNativeHandle(), ui::VKEY_V,
                             false, false, false, true);
 }
 #endif
@@ -2289,7 +2289,7 @@ void BrowserView::LoadAccelerators() {
     bool ctrl_down = (accelerators[i].fVirt & FCONTROL) == FCONTROL;
     bool shift_down = (accelerators[i].fVirt & FSHIFT) == FSHIFT;
     views::Accelerator accelerator(
-        static_cast<app::KeyboardCode>(accelerators[i].key),
+        static_cast<ui::KeyboardCode>(accelerators[i].key),
         shift_down, ctrl_down, alt_down);
     accelerator_table_[accelerator] = accelerators[i].cmd;
 
@@ -2448,53 +2448,53 @@ void BrowserView::UpdateAcceleratorMetrics(
 #if defined(OS_CHROMEOS)
   // Collect information about the relative popularity of various accelerators
   // on Chrome OS.
-  const app::KeyboardCode key_code = accelerator.GetKeyCode();
+  const ui::KeyboardCode key_code = accelerator.GetKeyCode();
   switch (command_id) {
     case IDC_BACK:
-      if (key_code == app::VKEY_BACK)
+      if (key_code == ui::VKEY_BACK)
         UserMetrics::RecordAction(UserMetricsAction("Accel_Back_Backspace"));
-      else if (key_code == app::VKEY_F1)
+      else if (key_code == ui::VKEY_F1)
         UserMetrics::RecordAction(UserMetricsAction("Accel_Back_F1"));
-      else if (key_code == app::VKEY_LEFT)
+      else if (key_code == ui::VKEY_LEFT)
         UserMetrics::RecordAction(UserMetricsAction("Accel_Back_Left"));
       break;
     case IDC_FORWARD:
-      if (key_code == app::VKEY_BACK)
+      if (key_code == ui::VKEY_BACK)
         UserMetrics::RecordAction(UserMetricsAction("Accel_Forward_Backspace"));
-      else if (key_code == app::VKEY_F2)
+      else if (key_code == ui::VKEY_F2)
         UserMetrics::RecordAction(UserMetricsAction("Accel_Forward_F2"));
-      else if (key_code == app::VKEY_LEFT)
+      else if (key_code == ui::VKEY_LEFT)
         UserMetrics::RecordAction(UserMetricsAction("Accel_Forward_Right"));
       break;
     case IDC_RELOAD:
     case IDC_RELOAD_IGNORING_CACHE:
-      if (key_code == app::VKEY_R)
+      if (key_code == ui::VKEY_R)
         UserMetrics::RecordAction(UserMetricsAction("Accel_Reload_R"));
-      else if (key_code == app::VKEY_F3)
+      else if (key_code == ui::VKEY_F3)
         UserMetrics::RecordAction(UserMetricsAction("Accel_Reload_F3"));
       break;
     case IDC_FULLSCREEN:
-      if (key_code == app::VKEY_F4)
+      if (key_code == ui::VKEY_F4)
         UserMetrics::RecordAction(UserMetricsAction("Accel_Fullscreen_F4"));
       break;
     case IDC_NEW_TAB:
-      if (key_code == app::VKEY_T)
+      if (key_code == ui::VKEY_T)
         UserMetrics::RecordAction(UserMetricsAction("Accel_NewTab_T"));
       break;
     case IDC_SEARCH:
-      if (key_code == app::VKEY_LWIN)
+      if (key_code == ui::VKEY_LWIN)
         UserMetrics::RecordAction(UserMetricsAction("Accel_Search_LWin"));
       break;
     case IDC_FOCUS_LOCATION:
-      if (key_code == app::VKEY_D)
+      if (key_code == ui::VKEY_D)
         UserMetrics::RecordAction(UserMetricsAction("Accel_FocusLocation_D"));
-      else if (key_code == app::VKEY_L)
+      else if (key_code == ui::VKEY_L)
         UserMetrics::RecordAction(UserMetricsAction("Accel_FocusLocation_L"));
       break;
     case IDC_FOCUS_SEARCH:
-      if (key_code == app::VKEY_E)
+      if (key_code == ui::VKEY_E)
         UserMetrics::RecordAction(UserMetricsAction("Accel_FocusSearch_E"));
-      else if (key_code == app::VKEY_K)
+      else if (key_code == ui::VKEY_K)
         UserMetrics::RecordAction(UserMetricsAction("Accel_FocusSearch_K"));
       break;
     default:
diff --git a/chrome/browser/ui/views/fullscreen_exit_bubble.cc b/chrome/browser/ui/views/fullscreen_exit_bubble.cc
index d3f3910..2e59e6b 100644
--- a/chrome/browser/ui/views/fullscreen_exit_bubble.cc
+++ b/chrome/browser/ui/views/fullscreen_exit_bubble.cc
@@ -4,7 +4,6 @@
 
 #include "chrome/browser/ui/views/fullscreen_exit_bubble.h"
 
-#include "app/keyboard_codes.h"
 #include "app/l10n_util.h"
 #include "app/resource_bundle.h"
 #include "base/utf_string_conversions.h"
@@ -12,6 +11,7 @@
 #include "gfx/canvas_skia.h"
 #include "grit/generated_resources.h"
 #include "ui/base/animation/slide_animation.h"
+#include "ui/base/keycodes/keyboard_codes.h"
 #include "views/screen.h"
 #include "views/widget/root_view.h"
 #include "views/window/window.h"
@@ -147,7 +147,7 @@ FullscreenExitBubble::FullscreenExitBubble(
   size_animation_->Reset(1);
 
   // Create the contents view.
-  views::Accelerator accelerator(app::VKEY_UNKNOWN, false, false, false);
+  views::Accelerator accelerator(ui::VKEY_UNKNOWN, false, false, false);
   bool got_accelerator = frame->GetAccelerator(IDC_FULLSCREEN, &accelerator);
   DCHECK(got_accelerator);
   view_ = new FullscreenExitView(
diff --git a/chrome/browser/ui/views/html_dialog_view.cc b/chrome/browser/ui/views/html_dialog_view.cc
index dd5c50a..32de496 100644
--- a/chrome/browser/ui/views/html_dialog_view.cc
+++ b/chrome/browser/ui/views/html_dialog_view.cc
@@ -4,11 +4,11 @@
 
 #include "chrome/browser/ui/views/html_dialog_view.h"
 
-#include "app/keyboard_codes.h"
 #include "chrome/browser/tab_contents/tab_contents.h"
 #include "chrome/browser/ui/browser.h"
 #include "chrome/browser/ui/views/window.h"
 #include "chrome/common/native_web_keyboard_event.h"
+#include "ui/base/keycodes/keyboard_codes.h"
 #include "views/widget/root_view.h"
 #include "views/widget/widget.h"
 #include "views/window/window.h"
@@ -56,7 +56,7 @@ gfx::Size HtmlDialogView::GetPreferredSize() {
 
 bool HtmlDialogView::AcceleratorPressed(const views::Accelerator& accelerator) {
   // Pressing ESC closes the dialog.
-  DCHECK_EQ(app::VKEY_ESCAPE, accelerator.GetKeyCode());
+  DCHECK_EQ(ui::VKEY_ESCAPE, accelerator.GetKeyCode());
   OnDialogClosed(std::string());
   return true;
 }
@@ -214,7 +214,7 @@ void HtmlDialogView::InitDialog() {
                                                   this);
 
   // Pressing the ESC key will close the dialog.
-  AddAccelerator(views::Accelerator(app::VKEY_ESCAPE, false, false, false));
+  AddAccelerator(views::Accelerator(ui::VKEY_ESCAPE, false, false, false));
 
   DOMView::LoadURL(GetDialogContentURL());
 }
diff --git a/chrome/browser/ui/views/info_bubble.cc b/chrome/browser/ui/views/info_bubble.cc
index bb296f8..409d663 100644
--- a/chrome/browser/ui/views/info_bubble.cc
+++ b/chrome/browser/ui/views/info_bubble.cc
@@ -6,7 +6,6 @@
 
 #include <vector>
 
-#include "app/keyboard_codes.h"
 #include "chrome/browser/ui/window_sizer.h"
 #include "chrome/common/notification_service.h"
 #include "gfx/canvas_skia.h"
@@ -14,6 +13,7 @@
 #include "gfx/path.h"
 #include "third_party/skia/include/core/SkPaint.h"
 #include "ui/base/animation/slide_animation.h"
+#include "ui/base/keycodes/keyboard_codes.h"
 #include "views/fill_layout.h"
 #include "views/widget/root_view.h"
 #include "views/widget/widget.h"
@@ -449,7 +449,7 @@ void InfoBubble::Init(views::Widget* parent,
 
   // Register the Escape accelerator for closing.
   GetFocusManager()->RegisterAccelerator(
-      views::Accelerator(app::VKEY_ESCAPE, false, false, false), this);
+      views::Accelerator(ui::VKEY_ESCAPE, false, false, false), this);
 
   // Done creating the bubble.
   NotificationService::current()->Notify(NotificationType::INFO_BUBBLE_CREATED,
@@ -514,7 +514,7 @@ void InfoBubble::DoClose(bool closed_by_escape) {
     return;
 
   GetFocusManager()->UnregisterAccelerator(
-      views::Accelerator(app::VKEY_ESCAPE, false, false, false), this);
+      views::Accelerator(ui::VKEY_ESCAPE, false, false, false), this);
   if (delegate_)
     delegate_->InfoBubbleClosing(this, closed_by_escape);
   show_status_ = kClosed;
diff --git a/chrome/browser/ui/views/js_modal_dialog_views.cc b/chrome/browser/ui/views/js_modal_dialog_views.cc
index 429b442..8d95f14 100644
--- a/chrome/browser/ui/views/js_modal_dialog_views.cc
+++ b/chrome/browser/ui/views/js_modal_dialog_views.cc
@@ -4,13 +4,13 @@
 
 #include "chrome/browser/ui/views/js_modal_dialog_views.h"
 
-#include "app/keyboard_codes.h"
 #include "app/l10n_util.h"
 #include "app/message_box_flags.h"
 #include "base/utf_string_conversions.h"
 #include "chrome/browser/ui/app_modal_dialogs/app_modal_dialog.h"
 #include "chrome/browser/ui/views/window.h"
 #include "grit/generated_resources.h"
+#include "ui/base/keycodes/keyboard_codes.h"
 #include "views/controls/message_box_view.h"
 #include "views/window/window.h"
 
@@ -26,7 +26,7 @@ JSModalDialogViews::JSModalDialogViews(
   DCHECK(message_box_view_);
 
   message_box_view_->AddAccelerator(
-      views::Accelerator(app::VKEY_C, false, true, false));
+      views::Accelerator(ui::VKEY_C, false, true, false));
   if (parent->display_suppress_checkbox()) {
     message_box_view_->SetCheckBoxLabel(UTF16ToWide(
         l10n_util::GetStringUTF16(IDS_JAVASCRIPT_MESSAGEBOX_SUPPRESS_OPTION)));
diff --git a/chrome/browser/ui/views/keyword_editor_view.cc b/chrome/browser/ui/views/keyword_editor_view.cc
index 2899495..9e3ec7c 100644
--- a/chrome/browser/ui/views/keyword_editor_view.cc
+++ b/chrome/browser/ui/views/keyword_editor_view.cc
@@ -170,7 +170,7 @@ void KeywordEditorView::Init() {
       l10n_util::GetStringUTF16(IDS_SEARCH_ENGINES_EDITOR_NEW_BUTTON)));
   add_button_->SetEnabled(controller_->loaded());
   add_button_->AddAccelerator(
-      views::Accelerator(app::VKEY_A, false, false, true));
+      views::Accelerator(ui::VKEY_A, false, false, true));
   add_button_->SetAccessibleKeyboardShortcut(L"A");
 
   edit_button_ = new views::NativeButton(this, UTF16ToWide(
@@ -181,7 +181,7 @@ void KeywordEditorView::Init() {
       l10n_util::GetStringUTF16(IDS_SEARCH_ENGINES_EDITOR_REMOVE_BUTTON)));
   remove_button_->SetEnabled(false);
   remove_button_->AddAccelerator(
-      views::Accelerator(app::VKEY_R, false, false, true));
+      views::Accelerator(ui::VKEY_R, false, false, true));
   remove_button_->SetAccessibleKeyboardShortcut(L"R");
 
   make_default_button_ = new views::NativeButton(
diff --git a/chrome/browser/ui/views/location_bar/page_action_image_view.cc b/chrome/browser/ui/views/location_bar/page_action_image_view.cc
index 1156a6d..1612cf9 100644
--- a/chrome/browser/ui/views/location_bar/page_action_image_view.cc
+++ b/chrome/browser/ui/views/location_bar/page_action_image_view.cc
@@ -139,8 +139,8 @@ void PageActionImageView::OnMouseReleased(const views::MouseEvent& event,
 }
 
 bool PageActionImageView::OnKeyPressed(const views::KeyEvent& e) {
-  if (e.GetKeyCode() == app::VKEY_SPACE ||
-      e.GetKeyCode() == app::VKEY_RETURN) {
+  if (e.GetKeyCode() == ui::VKEY_SPACE ||
+      e.GetKeyCode() == ui::VKEY_RETURN) {
     ExecuteAction(1, false);
     return true;
   }
diff --git a/chrome/browser/ui/views/location_bar/star_view.cc b/chrome/browser/ui/views/location_bar/star_view.cc
index a52b1b6..2272810 100644
--- a/chrome/browser/ui/views/location_bar/star_view.cc
+++ b/chrome/browser/ui/views/location_bar/star_view.cc
@@ -59,8 +59,8 @@ void StarView::OnMouseReleased(const views::MouseEvent& event, bool canceled) {
 }
 
 bool StarView::OnKeyPressed(const views::KeyEvent& e) {
-  if (e.GetKeyCode() == app::VKEY_SPACE ||
-      e.GetKeyCode() == app::VKEY_RETURN) {
+  if (e.GetKeyCode() == ui::VKEY_SPACE ||
+      e.GetKeyCode() == ui::VKEY_RETURN) {
     command_updater_->ExecuteCommand(IDC_BOOKMARK_PAGE);
     return true;
   }
diff --git a/chrome/browser/ui/views/options/cookies_view.cc b/chrome/browser/ui/views/options/cookies_view.cc
index cf436d0..64d79f5 100644
--- a/chrome/browser/ui/views/options/cookies_view.cc
+++ b/chrome/browser/ui/views/options/cookies_view.cc
@@ -146,9 +146,9 @@ void CookiesView::ContentsChanged(views::Textfield* sender,
 
 bool CookiesView::HandleKeyEvent(views::Textfield* sender,
                                  const views::KeyEvent& key_event) {
-  if (key_event.GetKeyCode() == app::VKEY_ESCAPE) {
+  if (key_event.GetKeyCode() == ui::VKEY_ESCAPE) {
     ResetSearchQuery();
-  } else if (key_event.GetKeyCode() == app::VKEY_RETURN) {
+  } else if (key_event.GetKeyCode() == ui::VKEY_RETURN) {
     search_update_factory_.RevokeAll();
     UpdateSearchResults();
   }
@@ -241,8 +241,8 @@ void CookiesView::OnTreeViewSelectionChanged(views::TreeView* tree_view) {
   }
 }
 
-void CookiesView::OnTreeViewKeyDown(app::KeyboardCode keycode) {
-  if (keycode == app::VKEY_DELETE)
+void CookiesView::OnTreeViewKeyDown(ui::KeyboardCode keycode) {
+  if (keycode == ui::VKEY_DELETE)
     cookies_tree_->RemoveSelectedItems();
 }
 
diff --git a/chrome/browser/ui/views/options/cookies_view.h b/chrome/browser/ui/views/options/cookies_view.h
index af0d9ec..fbc8821 100644
--- a/chrome/browser/ui/views/options/cookies_view.h
+++ b/chrome/browser/ui/views/options/cookies_view.h
@@ -72,7 +72,7 @@ class CookiesView : public CookiesTreeModel::Observer,
   virtual void OnTreeViewSelectionChanged(views::TreeView* tree_view);
 
   // views::TreeViewController implementation.
-  virtual void OnTreeViewKeyDown(app::KeyboardCode keycode);
+  virtual void OnTreeViewKeyDown(ui::KeyboardCode keycode);
 
   // views::Textfield::Controller implementation.
   virtual void ContentsChanged(views::Textfield* sender,
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 a5ad31d..42a05e9 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
@@ -4,10 +4,10 @@
 
 #include "chrome/browser/ui/views/tab_contents/render_view_context_menu_views.h"
 
-#include "app/keyboard_codes.h"
 #include "base/logging.h"
 #include "chrome/app/chrome_command_ids.h"
 #include "grit/generated_resources.h"
+#include "ui/base/keycodes/keyboard_codes.h"
 #include "views/accelerator.h"
 #include "views/controls/menu/menu_2.h"
 
@@ -67,28 +67,28 @@ bool RenderViewContextMenuViews::GetAcceleratorForCommandId(
   // that Ctrl+C, Ctrl+V, Ctrl+X, Ctrl-A, etc do what they normally do.
   switch (command_id) {
     case IDC_CONTENT_CONTEXT_UNDO:
-      *accel = views::Accelerator(app::VKEY_Z, false, true, false);
+      *accel = views::Accelerator(ui::VKEY_Z, false, true, false);
       return true;
 
     case IDC_CONTENT_CONTEXT_REDO:
       // TODO(jcampan): should it be Ctrl-Y?
-      *accel = views::Accelerator(app::VKEY_Z, true, true, false);
+      *accel = views::Accelerator(ui::VKEY_Z, true, true, false);
       return true;
 
     case IDC_CONTENT_CONTEXT_CUT:
-      *accel = views::Accelerator(app::VKEY_X, false, true, false);
+      *accel = views::Accelerator(ui::VKEY_X, false, true, false);
       return true;
 
     case IDC_CONTENT_CONTEXT_COPY:
-      *accel = views::Accelerator(app::VKEY_C, false, true, false);
+      *accel = views::Accelerator(ui::VKEY_C, false, true, false);
       return true;
 
     case IDC_CONTENT_CONTEXT_PASTE:
-      *accel = views::Accelerator(app::VKEY_V, false, true, false);
+      *accel = views::Accelerator(ui::VKEY_V, false, true, false);
       return true;
 
     case IDC_CONTENT_CONTEXT_SELECTALL:
-      *accel = views::Accelerator(app::VKEY_A, false, true, false);
+      *accel = views::Accelerator(ui::VKEY_A, false, true, false);
       return true;
 
     default:
diff --git a/chrome/browser/ui/views/task_manager_view.cc b/chrome/browser/ui/views/task_manager_view.cc
index 4953308..e12dd20 100644
--- a/chrome/browser/ui/views/task_manager_view.cc
+++ b/chrome/browser/ui/views/task_manager_view.cc
@@ -233,7 +233,7 @@ class TaskManagerView : public views::View,
   // views::TableViewObserver implementation.
   virtual void OnSelectionChanged();
   virtual void OnDoubleClick();
-  virtual void OnKeyDown(app::KeyboardCode keycode);
+  virtual void OnKeyDown(ui::KeyboardCode keycode);
 
   // views::LinkController implementation.
   virtual void LinkActivated(views::Link* source, int event_flags);
@@ -384,7 +384,7 @@ void TaskManagerView::Init() {
   }
   kill_button_ = new views::NativeButton(
       this, UTF16ToWide(l10n_util::GetStringUTF16(IDS_TASK_MANAGER_KILL)));
-  kill_button_->AddAccelerator(views::Accelerator(app::VKEY_E,
+  kill_button_->AddAccelerator(views::Accelerator(ui::VKEY_E,
                                                   false, false, false));
   kill_button_->SetAccessibleKeyboardShortcut(L"E");
   about_memory_link_ = new views::Link(UTF16ToWide(
@@ -600,8 +600,8 @@ void TaskManagerView::OnDoubleClick() {
   ActivateFocusedTab();
 }
 
-void TaskManagerView::OnKeyDown(app::KeyboardCode keycode) {
-  if (keycode == app::VKEY_RETURN)
+void TaskManagerView::OnKeyDown(ui::KeyboardCode keycode) {
+  if (keycode == ui::VKEY_RETURN)
     ActivateFocusedTab();
 }
 
diff --git a/chrome/browser/ui/views/toolbar_view.cc b/chrome/browser/ui/views/toolbar_view.cc
index dca962e..38ab6e5 100644
--- a/chrome/browser/ui/views/toolbar_view.cc
+++ b/chrome/browser/ui/views/toolbar_view.cc
@@ -460,13 +460,13 @@ bool ToolbarView::GetAcceleratorForCommandId(int command_id,
   // TODO(cpu) Bug 1109102. Query WebKit land for the actual bindings.
   switch (command_id) {
     case IDC_CUT:
-      *accelerator = views::Accelerator(app::VKEY_X, false, true, false);
+      *accelerator = views::Accelerator(ui::VKEY_X, false, true, false);
       return true;
     case IDC_COPY:
-      *accelerator = views::Accelerator(app::VKEY_C, false, true, false);
+      *accelerator = views::Accelerator(ui::VKEY_C, false, true, false);
       return true;
     case IDC_PASTE:
-      *accelerator = views::Accelerator(app::VKEY_V, false, true, false);
+      *accelerator = views::Accelerator(ui::VKEY_V, false, true, false);
       return true;
   }
   // Else, we retrieve the accelerator information from the frame.
diff --git a/chrome/browser/ui/views/unhandled_keyboard_event_handler.cc b/chrome/browser/ui/views/unhandled_keyboard_event_handler.cc
index b31b9f6..02eda65 100644
--- a/chrome/browser/ui/views/unhandled_keyboard_event_handler.cc
+++ b/chrome/browser/ui/views/unhandled_keyboard_event_handler.cc
@@ -34,7 +34,7 @@ void UnhandledKeyboardEventHandler::HandleKeyboardEvent(
 
   if (event.type == WebKit::WebInputEvent::RawKeyDown) {
     views::Accelerator accelerator(
-        static_cast<app::KeyboardCode>(event.windowsKeyCode),
+        static_cast<ui::KeyboardCode>(event.windowsKeyCode),
         (event.modifiers & NativeWebKeyboardEvent::ShiftKey) ==
             NativeWebKeyboardEvent::ShiftKey,
         (event.modifiers & NativeWebKeyboardEvent::ControlKey) ==
diff --git a/chrome/browser/ui/views/url_picker.cc b/chrome/browser/ui/views/url_picker.cc
index e020de3..b7bfd0e 100644
--- a/chrome/browser/ui/views/url_picker.cc
+++ b/chrome/browser/ui/views/url_picker.cc
@@ -4,7 +4,6 @@
 
 #include "chrome/browser/ui/views/url_picker.h"
 
-#include "app/keyboard_codes.h"
 #include "app/l10n_util.h"
 #include "app/resource_bundle.h"
 #include "app/table_model.h"
@@ -20,6 +19,7 @@
 #include "grit/generated_resources.h"
 #include "grit/locale_settings.h"
 #include "net/base/net_util.h"
+#include "ui/base/keycodes/keyboard_codes.h"
 #include "views/background.h"
 #include "views/controls/label.h"
 #include "views/controls/table/table_view.h"
@@ -113,7 +113,7 @@ UrlPicker::UrlPicker(UrlPickerDelegate* delegate,
 
   layout->AddPaddingRow(0, kRelatedControlVerticalSpacing);
 
-  AddAccelerator(views::Accelerator(app::VKEY_RETURN, false, false, false));
+  AddAccelerator(views::Accelerator(ui::VKEY_RETURN, false, false, false));
 }
 
 UrlPicker::~UrlPicker() {