Move the keyboard files from base/ to app/.

Also moves the associated classes/enums from base:: to app::.

TEST=try bots compile
BUG=NONE

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

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

27 files changed, 205 insertions, 205 deletions

diff --git a/chrome/browser/views/accelerator_table_gtk.cc b/chrome/browser/views/accelerator_table_gtk.cc
index 1841ac6..ff6b87d 100644
--- a/chrome/browser/views/accelerator_table_gtk.cc
+++ b/chrome/browser/views/accelerator_table_gtk.cc
@@ -4,8 +4,8 @@
 
 #include "chrome/browser/views/accelerator_table_gtk.h"
 
+#include "app/keyboard_codes.h"
 #include "base/basictypes.h"
-#include "base/keyboard_codes.h"
 #include "chrome/app/chrome_dll_resource.h"
 
 namespace browser {
@@ -14,135 +14,135 @@ namespace browser {
 // the Windows accelerators in ../../app/chrome_dll.rc.
 const AcceleratorMapping kAcceleratorMap[] = {
   // Keycode                   Shift  Ctrl   Alt    Command ID
-  { base::VKEY_A,              true,  true,  false, IDC_AUTOFILL_DEFAULT },
-  { base::VKEY_LEFT,           false, false, true,  IDC_BACK },
-  { base::VKEY_BACK,           false, false, false, IDC_BACK },
+  { 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 },
 #if defined(OS_CHROMEOS)
-  { base::VKEY_F1,             false, false, false, IDC_BACK },
+  { app::VKEY_F1,             false, false, false, IDC_BACK },
 #endif
-  { base::VKEY_D,              false, true,  false, IDC_BOOKMARK_PAGE },
-  { base::VKEY_D,              true,  true,  false, IDC_BOOKMARK_ALL_TABS },
-  { base::VKEY_DELETE,         true,  true,  false, IDC_CLEAR_BROWSING_DATA },
+  { 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 },
 #if !defined(OS_CHROMEOS)
-  { base::VKEY_F4,             false, true,  false, IDC_CLOSE_TAB },
+  { app::VKEY_F4,             false, true,  false, IDC_CLOSE_TAB },
 #endif
-  { base::VKEY_W,              false, true,  false, IDC_CLOSE_TAB },
-  { base::VKEY_W,              true,  true,  false, IDC_CLOSE_WINDOW },
+  { app::VKEY_W,              false, true,  false, IDC_CLOSE_TAB },
+  { app::VKEY_W,              true,  true,  false, IDC_CLOSE_WINDOW },
 #if !defined(OS_CHROMEOS)
-  { base::VKEY_F4,             false, false, true,  IDC_CLOSE_WINDOW },
+  { app::VKEY_F4,             false, false, true,  IDC_CLOSE_WINDOW },
 #endif
-  { base::VKEY_Q,              true,  true,  false, IDC_EXIT },
-  { base::VKEY_F,              false, true,  false, IDC_FIND },
-  { base::VKEY_G,              false, true,  false, IDC_FIND_NEXT },
+  { 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 },
 #if !defined(OS_CHROMEOS)
-  { base::VKEY_F3,             false, false, false, IDC_FIND_NEXT },
+  { app::VKEY_F3,             false, false, false, IDC_FIND_NEXT },
 #endif
-  { base::VKEY_G,              true,  true,  false, IDC_FIND_PREVIOUS },
+  { app::VKEY_G,              true,  true,  false, IDC_FIND_PREVIOUS },
 #if !defined(OS_CHROMEOS)
-  { base::VKEY_F3,             true,  false, false, IDC_FIND_PREVIOUS },
+  { app::VKEY_F3,             true,  false, false, IDC_FIND_PREVIOUS },
 #endif
 #if defined(OS_CHROMEOS)
-  { base::VKEY_S,              true,  false, true,  IDC_FOCUS_CHROMEOS_STATUS },
+  { app::VKEY_S,              true,  false, true,  IDC_FOCUS_CHROMEOS_STATUS },
 #endif
-  { base::VKEY_D,              false, false, true,  IDC_FOCUS_LOCATION },
-  { base::VKEY_L,              false, true,  false, IDC_FOCUS_LOCATION },
+  { app::VKEY_D,              false, false, true,  IDC_FOCUS_LOCATION },
+  { app::VKEY_L,              false, true,  false, IDC_FOCUS_LOCATION },
 #if !defined(OS_CHROMEOS)
-  { base::VKEY_F10,            false, false, false, IDC_FOCUS_MENU_BAR },
+  { app::VKEY_F10,            false, false, false, IDC_FOCUS_MENU_BAR },
 #endif
-  { base::VKEY_MENU,           false, false, false, IDC_FOCUS_MENU_BAR },
+  { app::VKEY_MENU,           false, false, false, IDC_FOCUS_MENU_BAR },
 #if !defined(OS_CHROMEOS)
-  { base::VKEY_F6,             false, false, false, IDC_FOCUS_NEXT_PANE },
+  { app::VKEY_F6,             false, false, false, IDC_FOCUS_NEXT_PANE },
 #endif
 #if defined(OS_CHROMEOS)
-  { base::VKEY_F2,             false, true,  false, IDC_FOCUS_NEXT_PANE },
+  { app::VKEY_F2,             false, true,  false, IDC_FOCUS_NEXT_PANE },
 #endif
 #if !defined(OS_CHROMEOS)
-  { base::VKEY_F6,             true,  false, false, IDC_FOCUS_PREVIOUS_PANE },
+  { app::VKEY_F6,             true,  false, false, IDC_FOCUS_PREVIOUS_PANE },
 #endif
 #if defined(OS_CHROMEOS)
-  { base::VKEY_F1,             false, true,  false, IDC_FOCUS_PREVIOUS_PANE },
-#endif
-  { base::VKEY_K,              false, true,  false, IDC_FOCUS_SEARCH },
-  { base::VKEY_E,              false, true,  false, IDC_FOCUS_SEARCH },
-  { base::VKEY_BROWSER_SEARCH, false, false, false, IDC_FOCUS_SEARCH },
-  { base::VKEY_T,              true,  false, true,  IDC_FOCUS_TOOLBAR },
-  { base::VKEY_B,              true,  false, true,  IDC_FOCUS_BOOKMARKS },
-  { base::VKEY_RIGHT,          false, false, true,  IDC_FORWARD },
-  { base::VKEY_BACK,           true,  false, false, IDC_FORWARD },
+  { 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 },
 #if defined(OS_CHROMEOS)
-  { base::VKEY_F2,             false, false, false, IDC_FORWARD },
+  { app::VKEY_F2,             false, false, false, IDC_FORWARD },
 #endif
 #if !defined(OS_CHROMEOS)
-  { base::VKEY_F11,            false, false, false, IDC_FULLSCREEN },
+  { app::VKEY_F11,            false, false, false, IDC_FULLSCREEN },
 #endif
 #if defined(OS_CHROMEOS)
-  { base::VKEY_F4,             false, false, false, IDC_FULLSCREEN },
+  { app::VKEY_F4,             false, false, false, IDC_FULLSCREEN },
 #endif
 #if !defined(OS_CHROMEOS)
-  { base::VKEY_F1,             false, false, false, IDC_HELP_PAGE },
-#endif
-  { base::VKEY_I,              true,  true,  false, IDC_DEV_TOOLS },
-  { base::VKEY_J,              true,  true,  false, IDC_DEV_TOOLS_CONSOLE },
-  { base::VKEY_C,              true,  true,  false, IDC_DEV_TOOLS_INSPECT },
-  { base::VKEY_N,              true,  true,  false, IDC_NEW_INCOGNITO_WINDOW },
-  { base::VKEY_T,              false, true,  false, IDC_NEW_TAB },
-  { base::VKEY_N,              false, true,  false, IDC_NEW_WINDOW },
-  { base::VKEY_O,              false, true,  false, IDC_OPEN_FILE },
-  { base::VKEY_P,              false, true,  false, IDC_PRINT},
-  { base::VKEY_R,              false, true,  false, IDC_RELOAD },
-  { base::VKEY_R,              true,  true,  false, IDC_RELOAD_IGNORING_CACHE },
+  { app::VKEY_F1,             false, false, 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 },
 #if !defined(OS_CHROMEOS)
-  { base::VKEY_F5,             false, false, false, IDC_RELOAD },
-  { base::VKEY_F5,             false, true,  false, IDC_RELOAD_IGNORING_CACHE },
-  { base::VKEY_F5,             true,  false, false, IDC_RELOAD_IGNORING_CACHE },
+  { 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 },
 #endif
-  { base::VKEY_HOME,           false, false, true,  IDC_HOME },
-  { base::VKEY_T,              true,  true,  false, IDC_RESTORE_TAB },
-  { base::VKEY_S,              false, true,  false, IDC_SAVE_PAGE },
+  { 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 },
 #if defined(OS_CHROMEOS)
-  { base::VKEY_LWIN,           false, false, false, IDC_SEARCH },
-#endif
-  { base::VKEY_9,              false, true,  false, IDC_SELECT_LAST_TAB },
-  { base::VKEY_NUMPAD9,        false, true,  false, IDC_SELECT_LAST_TAB },
-  { base::VKEY_TAB,            false, true,  false, IDC_SELECT_NEXT_TAB },
-  { base::VKEY_NEXT,           false, true,  false, IDC_SELECT_NEXT_TAB },
-  { base::VKEY_TAB,            true,  true,  false, IDC_SELECT_PREVIOUS_TAB },
-  { base::VKEY_PRIOR,          false, true,  false, IDC_SELECT_PREVIOUS_TAB },
-  { base::VKEY_1,              false, true,  false, IDC_SELECT_TAB_0 },
-  { base::VKEY_NUMPAD1,        false, true,  false, IDC_SELECT_TAB_0 },
-  { base::VKEY_2,              false, true,  false, IDC_SELECT_TAB_1 },
-  { base::VKEY_NUMPAD2,        false, true,  false, IDC_SELECT_TAB_1 },
-  { base::VKEY_3,              false, true,  false, IDC_SELECT_TAB_2 },
-  { base::VKEY_NUMPAD3,        false, true,  false, IDC_SELECT_TAB_2 },
-  { base::VKEY_4,              false, true,  false, IDC_SELECT_TAB_3 },
-  { base::VKEY_NUMPAD4,        false, true,  false, IDC_SELECT_TAB_3 },
-  { base::VKEY_5,              false, true,  false, IDC_SELECT_TAB_4 },
-  { base::VKEY_NUMPAD5,        false, true,  false, IDC_SELECT_TAB_4 },
-  { base::VKEY_6,              false, true,  false, IDC_SELECT_TAB_5 },
-  { base::VKEY_NUMPAD6,        false, true,  false, IDC_SELECT_TAB_5 },
-  { base::VKEY_7,              false, true,  false, IDC_SELECT_TAB_6 },
-  { base::VKEY_NUMPAD7,        false, true,  false, IDC_SELECT_TAB_6 },
-  { base::VKEY_8,              false, true,  false, IDC_SELECT_TAB_7 },
-  { base::VKEY_NUMPAD8,        false, true,  false, IDC_SELECT_TAB_7 },
-  { base::VKEY_B,              true,  true,  false, IDC_SHOW_BOOKMARK_BAR },
-  { base::VKEY_J,              false, true,  false, IDC_SHOW_DOWNLOADS },
-  { base::VKEY_H,              false, true,  false, IDC_SHOW_HISTORY },
-  { base::VKEY_F,              false, false, true,  IDC_SHOW_APP_MENU},
-  { base::VKEY_E,              false, false, true,  IDC_SHOW_APP_MENU},
-  { base::VKEY_ESCAPE,         false, false, false, IDC_STOP },
+  { 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 },
 #if defined(OS_CHROMEOS)
-  { base::VKEY_F5,             false, false, false, IDC_SYSTEM_OPTIONS },
-#endif
-  { base::VKEY_ESCAPE,         true,  false, false, IDC_TASK_MANAGER },
-  { base::VKEY_U,              false, true,  false, IDC_VIEW_SOURCE },
-  { base::VKEY_OEM_MINUS,      false, true,  false, IDC_ZOOM_MINUS },
-  { base::VKEY_OEM_MINUS,      true,  true,  false, IDC_ZOOM_MINUS },
-  { base::VKEY_SUBTRACT,       false, true,  false, IDC_ZOOM_MINUS },
-  { base::VKEY_0,              false, true,  false, IDC_ZOOM_NORMAL },
-  { base::VKEY_NUMPAD0,        false, true,  false, IDC_ZOOM_NORMAL },
-  { base::VKEY_OEM_PLUS,       false, true,  false, IDC_ZOOM_PLUS },
-  { base::VKEY_OEM_PLUS,       true,  true,  false, IDC_ZOOM_PLUS },
-  { base::VKEY_ADD,            false, true,  false, IDC_ZOOM_PLUS },
+  { app::VKEY_F5,             false, false, false, IDC_SYSTEM_OPTIONS },
+#endif
+  { 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 },
 };
 
 const size_t kAcceleratorMapLength = arraysize(kAcceleratorMap);
diff --git a/chrome/browser/views/accelerator_table_gtk.h b/chrome/browser/views/accelerator_table_gtk.h
index 46abbcc..bbab634 100644
--- a/chrome/browser/views/accelerator_table_gtk.h
+++ b/chrome/browser/views/accelerator_table_gtk.h
@@ -8,14 +8,14 @@
 
 #include <stdio.h>
 
-#include "base/keyboard_codes.h"
+#include "app/keyboard_codes.h"
 
 // This contains the list of accelerators for the Linux toolkit_view
 // implementation.
 namespace browser {
 
   struct AcceleratorMapping {
-    base::KeyboardCode keycode;
+    app::KeyboardCode keycode;
     bool shift_pressed;
     bool ctrl_pressed;
     bool alt_pressed;
diff --git a/chrome/browser/views/accessible_toolbar_view.cc b/chrome/browser/views/accessible_toolbar_view.cc
index a06a342..7a73087 100644
--- a/chrome/browser/views/accessible_toolbar_view.cc
+++ b/chrome/browser/views/accessible_toolbar_view.cc
@@ -18,11 +18,11 @@ AccessibleToolbarView::AccessibleToolbarView()
     : toolbar_has_focus_(false),
       ALLOW_THIS_IN_INITIALIZER_LIST(method_factory_(this)),
       focus_manager_(NULL),
-      home_key_(base::VKEY_HOME, false, false, false),
-      end_key_(base::VKEY_END, false, false, false),
-      escape_key_(base::VKEY_ESCAPE, false, false, false),
-      left_key_(base::VKEY_LEFT, false, false, false),
-      right_key_(base::VKEY_RIGHT, false, false, false),
+      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),
       last_focused_view_storage_id_(-1) {
   focus_search_.reset(new views::FocusSearch(this, true, true));
 }
@@ -148,27 +148,27 @@ bool AccessibleToolbarView::AcceleratorPressed(
   views::View* focused_view = focus_manager_->GetFocusedView();
   if ((focused_view->GetClassName() == LocationBarView::kViewClassName ||
        focused_view->GetClassName() == views::NativeViewHost::kViewClassName) &&
-      (accelerator.GetKeyCode() == base::VKEY_LEFT ||
-       accelerator.GetKeyCode() == base::VKEY_RIGHT)) {
+      (accelerator.GetKeyCode() == app::VKEY_LEFT ||
+       accelerator.GetKeyCode() == app::VKEY_RIGHT)) {
     return false;
   }
 
   switch (accelerator.GetKeyCode()) {
-    case base::VKEY_ESCAPE:
+    case app::VKEY_ESCAPE:
       RemoveToolbarFocus();
       RestoreLastFocusedView();
       return true;
-    case base::VKEY_LEFT:
+    case app::VKEY_LEFT:
       focus_manager_->AdvanceFocus(true);
       return true;
-    case base::VKEY_RIGHT:
+    case app::VKEY_RIGHT:
       focus_manager_->AdvanceFocus(false);
       return true;
-    case base::VKEY_HOME:
+    case app::VKEY_HOME:
       focus_manager_->SetFocusedViewWithReason(
           GetFirstFocusableChild(), views::FocusManager::kReasonFocusTraversal);
       return true;
-    case base::VKEY_END:
+    case app::VKEY_END:
       focus_manager_->SetFocusedViewWithReason(
           GetLastFocusableChild(), views::FocusManager::kReasonFocusTraversal);
       return true;
diff --git a/chrome/browser/views/bookmark_bar_view_test.cc b/chrome/browser/views/bookmark_bar_view_test.cc
index d3884dd..9b7b512 100644
--- a/chrome/browser/views/bookmark_bar_view_test.cc
+++ b/chrome/browser/views/bookmark_bar_view_test.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 "base/keyboard_codes.h"
+#include "app/keyboard_codes.h"
 #include "base/string_number_conversions.h"
 #include "base/utf_string_conversions.h"
 #include "chrome/browser/automation/ui_controls.h"
@@ -873,7 +873,7 @@ class BookmarkBarViewTest10 : public BookmarkBarViewEventTestBase {
 
     // Send a down event, which should select the first item.
     ui_controls::SendKeyPressNotifyWhenDone(
-        NULL, base::VKEY_DOWN, false, false, false, false,
+        NULL, app::VKEY_DOWN, false, false, false, false,
         CreateEventTask(this, &BookmarkBarViewTest10::Step3));
   }
 
@@ -886,7 +886,7 @@ class BookmarkBarViewTest10 : public BookmarkBarViewEventTestBase {
 
     // Send a key down event, which should select the next item.
     ui_controls::SendKeyPressNotifyWhenDone(
-        NULL, base::VKEY_DOWN, false, false, false, false,
+        NULL, app::VKEY_DOWN, false, false, false, false,
         CreateEventTask(this, &BookmarkBarViewTest10::Step4));
   }
 
@@ -899,7 +899,7 @@ class BookmarkBarViewTest10 : public BookmarkBarViewEventTestBase {
 
     // Send a right arrow to force the menu to open.
     ui_controls::SendKeyPressNotifyWhenDone(
-        NULL, base::VKEY_RIGHT, false, false, false, false,
+        NULL, app::VKEY_RIGHT, false, false, false, false,
         CreateEventTask(this, &BookmarkBarViewTest10::Step5));
   }
 
@@ -915,7 +915,7 @@ class BookmarkBarViewTest10 : public BookmarkBarViewEventTestBase {
 
     // Send a left arrow to close the submenu.
     ui_controls::SendKeyPressNotifyWhenDone(
-        NULL, base::VKEY_LEFT, false, false, false, false,
+        NULL, app::VKEY_LEFT, false, false, false, false,
         CreateEventTask(this, &BookmarkBarViewTest10::Step6));
   }
 
@@ -930,7 +930,7 @@ class BookmarkBarViewTest10 : public BookmarkBarViewEventTestBase {
 
     // Send a down arrow to wrap back to f1a
     ui_controls::SendKeyPressNotifyWhenDone(
-        NULL, base::VKEY_DOWN, false, false, false, false,
+        NULL, app::VKEY_DOWN, false, false, false, false,
         CreateEventTask(this, &BookmarkBarViewTest10::Step7));
   }
 
@@ -943,7 +943,7 @@ class BookmarkBarViewTest10 : public BookmarkBarViewEventTestBase {
 
     // Send enter, which should select the item.
     ui_controls::SendKeyPressNotifyWhenDone(
-        NULL, base::VKEY_RETURN, false, false, false, false,
+        NULL, app::VKEY_RETURN, false, false, false, false,
         CreateEventTask(this, &BookmarkBarViewTest10::Step8));
   }
 
@@ -998,7 +998,7 @@ class BookmarkBarViewTest11 : public BookmarkBarViewEventTestBase {
   void Step3() {
     // Send escape so that the context menu hides.
     ui_controls::SendKeyPressNotifyWhenDone(
-        NULL, base::VKEY_ESCAPE, false, false, false, false,
+        NULL, app::VKEY_ESCAPE, false, false, false, false,
         CreateEventTask(this, &BookmarkBarViewTest11::Step4));
   }
 
@@ -1087,7 +1087,7 @@ class BookmarkBarViewTest12 : public BookmarkBarViewEventTestBase {
 
   void Step4() {
     // Press tab to give focus to the cancel button.
-    ui_controls::SendKeyPress(NULL, base::VKEY_TAB, false, false, false, false);
+    ui_controls::SendKeyPress(NULL, app::VKEY_TAB, false, false, false, false);
 
     // For some reason return isn't processed correctly unless we delay.
     MessageLoop::current()->PostDelayedTask(FROM_HERE,
@@ -1097,7 +1097,7 @@ class BookmarkBarViewTest12 : public BookmarkBarViewEventTestBase {
   void Step5() {
     // And press enter so that the cancel button is selected.
     ui_controls::SendKeyPressNotifyWhenDone(
-        NULL, base::VKEY_RETURN, false, false, false, false,
+        NULL, app::VKEY_RETURN, false, false, false, false,
         CreateEventTask(this, &BookmarkBarViewTest12::Step6));
   }
 
@@ -1226,7 +1226,7 @@ class BookmarkBarViewTest14 : public BookmarkBarViewEventTestBase {
 
     // Send escape so that the context menu hides.
     ui_controls::SendKeyPressNotifyWhenDone(
-        NULL, base::VKEY_ESCAPE, false, false, false, false,
+        NULL, app::VKEY_ESCAPE, false, false, false, false,
         CreateEventTask(this, &BookmarkBarViewTest14::Step3));
   }
 
diff --git a/chrome/browser/views/bookmark_bubble_view.cc b/chrome/browser/views/bookmark_bubble_view.cc
index 96065eb..c13f53f 100644
--- a/chrome/browser/views/bookmark_bubble_view.cc
+++ b/chrome/browser/views/bookmark_bubble_view.cc
@@ -4,9 +4,9 @@
 
 #include "chrome/browser/views/bookmark_bubble_view.h"
 
+#include "app/keyboard_codes.h"
 #include "app/l10n_util.h"
 #include "app/resource_bundle.h"
-#include "base/keyboard_codes.h"
 #include "base/string16.h"
 #include "base/string_util.h"
 #include "chrome/app/chrome_dll_resource.h"
@@ -129,7 +129,7 @@ void BookmarkBubbleView::DidChangeBounds(const gfx::Rect& previous,
 void BookmarkBubbleView::BubbleShown() {
   DCHECK(GetWidget());
   GetFocusManager()->RegisterAccelerator(
-      views::Accelerator(base::VKEY_RETURN, false, false, false), this);
+      views::Accelerator(app::VKEY_RETURN, false, false, false), this);
 
   title_tf_->RequestFocus();
   title_tf_->SelectAll();
@@ -137,7 +137,7 @@ void BookmarkBubbleView::BubbleShown() {
 
 bool BookmarkBubbleView::AcceleratorPressed(
     const views::Accelerator& accelerator) {
-  if (accelerator.GetKeyCode() != base::VKEY_RETURN)
+  if (accelerator.GetKeyCode() != app::VKEY_RETURN)
     return false;
 
   if (edit_button_->HasFocus())
diff --git a/chrome/browser/views/browser_keyboard_accessibility_test_win.cc b/chrome/browser/views/browser_keyboard_accessibility_test_win.cc
index f5b942f..1218367 100644
--- a/chrome/browser/views/browser_keyboard_accessibility_test_win.cc
+++ b/chrome/browser/views/browser_keyboard_accessibility_test_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 "base/keyboard_codes.h"
+#include "app/keyboard_codes.h"
 #include "chrome/browser/automation/ui_controls.h"
 #include "chrome/browser/views/chrome_views_delegate.h"
 #include "chrome/browser/views/frame/browser_view.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(),
-                                            base::VKEY_TAB,
+                                            app::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,
-                                          base::VKEY_T,
+                                          app::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, base::VKEY_TAB,
+    ui_controls::SendKeyPressNotifyWhenDone(hwnd, app::VKEY_TAB,
         false, !forward_tab, false, false, new MessageLoop::QuitTask());
     set_waiting(true);
     ui_test_utils::RunMessageLoop();
diff --git a/chrome/browser/views/dropdown_bar_host.cc b/chrome/browser/views/dropdown_bar_host.cc
index f756cb2..e55365b 100644
--- a/chrome/browser/views/dropdown_bar_host.cc
+++ b/chrome/browser/views/dropdown_bar_host.cc
@@ -4,8 +4,8 @@
 
 #include "chrome/browser/views/dropdown_bar_host.h"
 
+#include "app/keyboard_codes.h"
 #include "app/slide_animation.h"
-#include "base/keyboard_codes.h"
 #include "base/scoped_handle.h"
 #include "chrome/browser/browser.h"
 #include "chrome/browser/browser_process.h"
@@ -297,14 +297,14 @@ void DropdownBarHost::UpdateWindowEdges(const gfx::Rect& new_pos) {
 
 void DropdownBarHost::RegisterAccelerators() {
   DCHECK(!esc_accel_target_registered_);
-  views::Accelerator escape(base::VKEY_ESCAPE, false, false, false);
+  views::Accelerator escape(app::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(base::VKEY_ESCAPE, false, false, false);
+  views::Accelerator escape(app::VKEY_ESCAPE, false, false, false);
   focus_manager_->UnregisterAccelerator(escape, this);
   esc_accel_target_registered_ = false;
 }
diff --git a/chrome/browser/views/extensions/extension_view.cc b/chrome/browser/views/extensions/extension_view.cc
index 4e7f1ae..062bc00 100644
--- a/chrome/browser/views/extensions/extension_view.cc
+++ b/chrome/browser/views/extensions/extension_view.cc
@@ -173,7 +173,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() == base::VKEY_TAB);
+  return (e.GetKeyCode() == app::VKEY_TAB);
 }
 
 void ExtensionView::HandleMouseMove() {
diff --git a/chrome/browser/views/find_bar_host.cc b/chrome/browser/views/find_bar_host.cc
index 21dcf8b..3926e70 100644
--- a/chrome/browser/views/find_bar_host.cc
+++ b/chrome/browser/views/find_bar_host.cc
@@ -4,7 +4,7 @@
 
 #include "chrome/browser/views/find_bar_host.h"
 
-#include "base/keyboard_codes.h"
+#include "app/keyboard_codes.h"
 #include "chrome/browser/browser.h"
 #include "chrome/browser/browser_process.h"
 #include "chrome/browser/find_bar_controller.h"
@@ -48,13 +48,13 @@ bool FindBarHost::MaybeForwardKeystrokeToWebpage(
   }
 
   switch (key_stroke.GetKeyboardCode()) {
-    case base::VKEY_DOWN:
-    case base::VKEY_UP:
-    case base::VKEY_PRIOR:
-    case base::VKEY_NEXT:
+    case app::VKEY_DOWN:
+    case app::VKEY_UP:
+    case app::VKEY_PRIOR:
+    case app::VKEY_NEXT:
       break;
-    case base::VKEY_HOME:
-    case base::VKEY_END:
+    case app::VKEY_HOME:
+    case app::VKEY_END:
       if (key_stroke.IsControlHeld())
         break;
     // Fall through.
@@ -161,11 +161,11 @@ FindBarTesting* FindBarHost::GetFindBarTesting() {
 // FindBarWin, views::AcceleratorTarget implementation:
 
 bool FindBarHost::AcceleratorPressed(const views::Accelerator& accelerator) {
-  base::KeyboardCode key = accelerator.GetKeyCode();
-  if (key == base::VKEY_RETURN && accelerator.IsCtrlDown()) {
+  app::KeyboardCode key = accelerator.GetKeyCode();
+  if (key == app::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 == base::VKEY_ESCAPE) {
+  } else if (key == app::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.
@@ -277,13 +277,13 @@ void FindBarHost::RegisterAccelerators() {
   DropdownBarHost::RegisterAccelerators();
 
   // Register for Ctrl+Return.
-  views::Accelerator escape(base::VKEY_RETURN, false, true, false);
+  views::Accelerator escape(app::VKEY_RETURN, false, true, false);
   focus_manager()->RegisterAccelerator(escape, this);
 }
 
 void FindBarHost::UnregisterAccelerators() {
   // Unregister Ctrl+Return.
-  views::Accelerator escape(base::VKEY_RETURN, false, true, false);
+  views::Accelerator escape(app::VKEY_RETURN, false, true, false);
   focus_manager()->UnregisterAccelerator(escape, this);
 
   DropdownBarHost::UnregisterAccelerators();
diff --git a/chrome/browser/views/find_bar_host_interactive_uitest.cc b/chrome/browser/views/find_bar_host_interactive_uitest.cc
index 69d7284..baf9cf44 100644
--- a/chrome/browser/views/find_bar_host_interactive_uitest.cc
+++ b/chrome/browser/views/find_bar_host_interactive_uitest.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 "base/keyboard_codes.h"
+#include "app/keyboard_codes.h"
 #include "base/message_loop.h"
 #include "base/string_util.h"
 #include "base/utf_string_conversions.h"
@@ -121,7 +121,7 @@ IN_PROC_BROWSER_TEST_F(FindInPageTest, CrashEscHandlers) {
 
   // This used to crash until bug 1303709 was fixed.
   ASSERT_TRUE(ui_test_utils::SendKeyPressSync(
-      browser()->window()->GetNativeHandle(), base::VKEY_ESCAPE,
+      browser()->window()->GetNativeHandle(), app::VKEY_ESCAPE,
       false, false, false, false));
 }
 
@@ -187,21 +187,21 @@ IN_PROC_BROWSER_TEST_F(FindInPageTest, PrepopulateRespectBlank) {
 
   // Search for "a".
   ASSERT_TRUE(ui_test_utils::SendKeyPressSync(
-      window, base::VKEY_A, false, false, false, false));  // No modifiers
+      window, app::VKEY_A, false, false, false, false));  // No modifiers
 
   // We should find "a" here.
   EXPECT_EQ(ASCIIToUTF16("a"), GetFindBarText());
 
   // Delete "a".
   ASSERT_TRUE(ui_test_utils::SendKeyPressSync(
-      window, base::VKEY_BACK, false, false, false, false));  // No modifiers.
+      window, app::VKEY_BACK, false, false, false, false));  // No modifiers.
 
   // Validate we have cleared the text.
   EXPECT_EQ(string16(), GetFindBarText());
 
   // Close the Find box.
   ASSERT_TRUE(ui_test_utils::SendKeyPressSync(
-      window, base::VKEY_ESCAPE, false, false, false, false));  // No modifiers.
+      window, app::VKEY_ESCAPE, false, false, false, false));  // No modifiers.
 
   // Show the Find bar.
   browser()->GetFindBarController()->Show();
@@ -212,11 +212,11 @@ IN_PROC_BROWSER_TEST_F(FindInPageTest, PrepopulateRespectBlank) {
 
   // Close the Find box.
   ASSERT_TRUE(ui_test_utils::SendKeyPressSync(
-      window, base::VKEY_ESCAPE, false, false, false, false));  // No modifiers.
+      window, app::VKEY_ESCAPE, false, false, false, false));  // No modifiers.
 
   // Press F3 to trigger FindNext.
   ASSERT_TRUE(ui_test_utils::SendKeyPressSync(
-      window, base::VKEY_F3, false, false, false, false));  // No modifiers.
+      window, app::VKEY_F3, false, false, false, false));  // No modifiers.
 
   // After the Find box has been reopened, it should still have no prepopulate
   // value.
diff --git a/chrome/browser/views/find_bar_view.cc b/chrome/browser/views/find_bar_view.cc
index 0007d9c..7132553 100644
--- a/chrome/browser/views/find_bar_view.cc
+++ b/chrome/browser/views/find_bar_view.cc
@@ -475,7 +475,7 @@ bool FindBarView::HandleKeystroke(views::Textfield* sender,
   if (find_bar_host()->MaybeForwardKeystrokeToWebpage(key))
     return true;  // Handled, we are done!
 
-  if (key.GetKeyboardCode() == base::VKEY_RETURN) {
+  if (key.GetKeyboardCode() == app::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/views/frame/browser_view.cc b/chrome/browser/views/frame/browser_view.cc
index 819fb75..28d187a 100644
--- a/chrome/browser/views/frame/browser_view.cc
+++ b/chrome/browser/views/frame/browser_view.cc
@@ -688,13 +688,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(base::VKEY_X, false, true, false);
+      *accelerator = views::Accelerator(app::VKEY_X, false, true, false);
       return true;
     case IDC_COPY:
-      *accelerator = views::Accelerator(base::VKEY_C, false, true, false);
+      *accelerator = views::Accelerator(app::VKEY_C, false, true, false);
       return true;
     case IDC_PASTE:
-      *accelerator = views::Accelerator(base::VKEY_V, false, true, false);
+      *accelerator = views::Accelerator(app::VKEY_V, false, true, false);
       return true;
   }
   // Else, we retrieve the accelerator information from the accelerator table.
@@ -1293,7 +1293,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 == base::VKEY_F4 &&
+  if (event.windowsKeyCode == app::VKEY_F4 &&
       event.modifiers == NativeWebKeyboardEvent::AltKey) {
     DefWindowProc(event.os_event.hwnd, event.os_event.message,
                   event.os_event.wParam, event.os_event.lParam);
@@ -1305,7 +1305,7 @@ bool BrowserView::PreHandleKeyboardEvent(const NativeWebKeyboardEvent& event,
   DCHECK(focus_manager);
 
   views::Accelerator accelerator(
-      static_cast<base::KeyboardCode>(event.windowsKeyCode),
+      static_cast<app::KeyboardCode>(event.windowsKeyCode),
       (event.modifiers & NativeWebKeyboardEvent::ShiftKey) ==
           NativeWebKeyboardEvent::ShiftKey,
       (event.modifiers & NativeWebKeyboardEvent::ControlKey) ==
@@ -1371,34 +1371,34 @@ void BrowserView::HandleKeyboardEvent(const NativeWebKeyboardEvent& event) {
 // manager to do that.
 #if !defined(OS_MACOSX)
 void BrowserView::Cut() {
-  ui_controls::SendKeyPress(GetNativeHandle(), base::VKEY_X,
+  ui_controls::SendKeyPress(GetNativeHandle(), app::VKEY_X,
                             true, false, false, false);
 }
 
 void BrowserView::Copy() {
-  ui_controls::SendKeyPress(GetNativeHandle(), base::VKEY_C,
+  ui_controls::SendKeyPress(GetNativeHandle(), app::VKEY_C,
                             true, false, false, false);
 }
 
 void BrowserView::Paste() {
-  ui_controls::SendKeyPress(GetNativeHandle(), base::VKEY_V,
+  ui_controls::SendKeyPress(GetNativeHandle(), app::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(), base::VKEY_X,
+  ui_controls::SendKeyPress(GetNativeHandle(), app::VKEY_X,
                             false, false, false, true);
 }
 
 void BrowserView::Copy() {
-  ui_controls::SendKeyPress(GetNativeHandle(), base::VKEY_C,
+  ui_controls::SendKeyPress(GetNativeHandle(), app::VKEY_C,
                             false, false, false, true);
 }
 
 void BrowserView::Paste() {
-  ui_controls::SendKeyPress(GetNativeHandle(), base::VKEY_V,
+  ui_controls::SendKeyPress(GetNativeHandle(), app::VKEY_V,
                             false, false, false, true);
 }
 #endif
@@ -2304,7 +2304,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<base::KeyboardCode>(accelerators[i].key),
+        static_cast<app::KeyboardCode>(accelerators[i].key),
         shift_down, ctrl_down, alt_down);
     accelerator_table_[accelerator] = accelerators[i].cmd;
 
diff --git a/chrome/browser/views/fullscreen_exit_bubble.cc b/chrome/browser/views/fullscreen_exit_bubble.cc
index e44b4d7..4777f51 100644
--- a/chrome/browser/views/fullscreen_exit_bubble.cc
+++ b/chrome/browser/views/fullscreen_exit_bubble.cc
@@ -4,9 +4,9 @@
 
 #include "chrome/browser/views/fullscreen_exit_bubble.h"
 
+#include "app/keyboard_codes.h"
 #include "app/l10n_util.h"
 #include "app/resource_bundle.h"
-#include "base/keyboard_codes.h"
 #include "chrome/app/chrome_dll_resource.h"
 #include "gfx/canvas_skia.h"
 #include "grit/generated_resources.h"
@@ -142,7 +142,7 @@ FullscreenExitBubble::FullscreenExitBubble(
   size_animation_->Reset(1);
 
   // Create the contents view.
-  views::Accelerator accelerator(base::VKEY_UNKNOWN, false, false, false);
+  views::Accelerator accelerator(app::VKEY_UNKNOWN, false, false, false);
   bool got_accelerator = frame->GetAccelerator(IDC_FULLSCREEN, &accelerator);
   DCHECK(got_accelerator);
   view_ = new FullscreenExitView(this, accelerator.GetShortcutText());
diff --git a/chrome/browser/views/html_dialog_view.cc b/chrome/browser/views/html_dialog_view.cc
index 3fd6157..d2f4c04 100644
--- a/chrome/browser/views/html_dialog_view.cc
+++ b/chrome/browser/views/html_dialog_view.cc
@@ -4,7 +4,7 @@
 
 #include "chrome/browser/views/html_dialog_view.h"
 
-#include "base/keyboard_codes.h"
+#include "app/keyboard_codes.h"
 #include "chrome/browser/browser.h"
 #include "chrome/browser/tab_contents/tab_contents.h"
 #include "chrome/common/native_web_keyboard_event.h"
@@ -55,7 +55,7 @@ gfx::Size HtmlDialogView::GetPreferredSize() {
 
 bool HtmlDialogView::AcceleratorPressed(const views::Accelerator& accelerator) {
   // Pressing ESC closes the dialog.
-  DCHECK_EQ(base::VKEY_ESCAPE, accelerator.GetKeyCode());
+  DCHECK_EQ(app::VKEY_ESCAPE, accelerator.GetKeyCode());
   OnDialogClosed(std::string());
   return true;
 }
@@ -201,7 +201,7 @@ void HtmlDialogView::InitDialog() {
                                                   this);
 
   // Pressing the ESC key will close the dialog.
-  AddAccelerator(views::Accelerator(base::VKEY_ESCAPE, false, false, false));
+  AddAccelerator(views::Accelerator(app::VKEY_ESCAPE, false, false, false));
 
   DOMView::LoadURL(GetDialogContentURL());
 }
diff --git a/chrome/browser/views/info_bubble.cc b/chrome/browser/views/info_bubble.cc
index 48b7626..3ee1317 100644
--- a/chrome/browser/views/info_bubble.cc
+++ b/chrome/browser/views/info_bubble.cc
@@ -4,7 +4,7 @@
 
 #include "chrome/browser/views/info_bubble.h"
 
-#include "base/keyboard_codes.h"
+#include "app/keyboard_codes.h"
 #include "chrome/browser/window_sizer.h"
 #include "chrome/common/notification_service.h"
 #include "gfx/canvas_skia.h"
@@ -426,7 +426,7 @@ void InfoBubble::Init(views::Widget* parent,
 
   // Register the Escape accelerator for closing.
   GetFocusManager()->RegisterAccelerator(
-      views::Accelerator(base::VKEY_ESCAPE, false, false, false), this);
+      views::Accelerator(app::VKEY_ESCAPE, false, false, false), this);
 
   // Done creating the bubble.
   NotificationService::current()->Notify(NotificationType::INFO_BUBBLE_CREATED,
@@ -491,7 +491,7 @@ void InfoBubble::DoClose(bool closed_by_escape) {
     return;
 
   GetFocusManager()->UnregisterAccelerator(
-      views::Accelerator(base::VKEY_ESCAPE, false, false, false), this);
+      views::Accelerator(app::VKEY_ESCAPE, false, false, false), this);
   if (delegate_)
     delegate_->InfoBubbleClosing(this, closed_by_escape);
   show_status_ = kClosed;
diff --git a/chrome/browser/views/jsmessage_box_dialog.cc b/chrome/browser/views/jsmessage_box_dialog.cc
index 5d8049a..f51116b 100644
--- a/chrome/browser/views/jsmessage_box_dialog.cc
+++ b/chrome/browser/views/jsmessage_box_dialog.cc
@@ -4,9 +4,9 @@
 
 #include "chrome/browser/views/jsmessage_box_dialog.h"
 
+#include "app/keyboard_codes.h"
 #include "app/l10n_util.h"
 #include "app/message_box_flags.h"
-#include "base/keyboard_codes.h"
 #include "chrome/browser/app_modal_dialog.h"
 #include "chrome/browser/tab_contents/tab_contents.h"
 #include "grit/generated_resources.h"
@@ -25,7 +25,7 @@ JavaScriptMessageBoxDialog::JavaScriptMessageBoxDialog(
   DCHECK(message_box_view_);
 
   message_box_view_->AddAccelerator(
-      views::Accelerator(base::VKEY_C, false, true, false));
+      views::Accelerator(app::VKEY_C, false, true, false));
   if (display_suppress_checkbox) {
     message_box_view_->SetCheckBoxLabel(
         l10n_util::GetString(IDS_JAVASCRIPT_MESSAGEBOX_SUPPRESS_OPTION));
diff --git a/chrome/browser/views/keyword_editor_view.cc b/chrome/browser/views/keyword_editor_view.cc
index 5815843..b3b4974 100644
--- a/chrome/browser/views/keyword_editor_view.cc
+++ b/chrome/browser/views/keyword_editor_view.cc
@@ -169,7 +169,7 @@ void KeywordEditorView::Init() {
       this, l10n_util::GetString(IDS_SEARCH_ENGINES_EDITOR_NEW_BUTTON));
   add_button_->SetEnabled(controller_->loaded());
   add_button_->AddAccelerator(
-      views::Accelerator(base::VKEY_A, false, false, true));
+      views::Accelerator(app::VKEY_A, false, false, true));
   add_button_->SetAccessibleKeyboardShortcut(L"A");
 
   edit_button_ = new views::NativeButton(
@@ -180,7 +180,7 @@ void KeywordEditorView::Init() {
       this, l10n_util::GetString(IDS_SEARCH_ENGINES_EDITOR_REMOVE_BUTTON));
   remove_button_->SetEnabled(false);
   remove_button_->AddAccelerator(
-      views::Accelerator(base::VKEY_R, false, false, true));
+      views::Accelerator(app::VKEY_R, false, false, true));
   remove_button_->SetAccessibleKeyboardShortcut(L"R");
 
   make_default_button_ = new views::NativeButton(
diff --git a/chrome/browser/views/location_bar/location_bar_view.cc b/chrome/browser/views/location_bar/location_bar_view.cc
index 97b9f2a..7b0ad1d 100644
--- a/chrome/browser/views/location_bar/location_bar_view.cc
+++ b/chrome/browser/views/location_bar/location_bar_view.cc
@@ -942,7 +942,7 @@ bool LocationBarView::SkipDefaultKeyEventProcessing(const views::KeyEvent& e) {
   // it can be shared between Windows and Linux.
   // For now, we just override back-space and tab keys, as back-space is the
   // accelerator for back navigation and tab key is used by some input methods.
-  if (e.GetKeyCode() == base::VKEY_BACK ||
+  if (e.GetKeyCode() == app::VKEY_BACK ||
       views::FocusManager::IsTabTraversalKeyEvent(e))
     return true;
   return false;
diff --git a/chrome/browser/views/location_bar/page_action_image_view.cc b/chrome/browser/views/location_bar/page_action_image_view.cc
index c2d72e3..058100c 100644
--- a/chrome/browser/views/location_bar/page_action_image_view.cc
+++ b/chrome/browser/views/location_bar/page_action_image_view.cc
@@ -137,8 +137,8 @@ void PageActionImageView::OnMouseReleased(const views::MouseEvent& event,
 }
 
 bool PageActionImageView::OnKeyPressed(const views::KeyEvent& e) {
-  if (e.GetKeyCode() == base::VKEY_SPACE ||
-      e.GetKeyCode() == base::VKEY_RETURN) {
+  if (e.GetKeyCode() == app::VKEY_SPACE ||
+      e.GetKeyCode() == app::VKEY_RETURN) {
     ExecuteAction(1, false);
     return true;
   }
diff --git a/chrome/browser/views/location_bar/star_view.cc b/chrome/browser/views/location_bar/star_view.cc
index 06bb843..9b4f2c5 100644
--- a/chrome/browser/views/location_bar/star_view.cc
+++ b/chrome/browser/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() == base::VKEY_SPACE ||
-      e.GetKeyCode() == base::VKEY_RETURN) {
+  if (e.GetKeyCode() == app::VKEY_SPACE ||
+      e.GetKeyCode() == app::VKEY_RETURN) {
     command_updater_->ExecuteCommand(IDC_BOOKMARK_PAGE);
     return true;
   }
diff --git a/chrome/browser/views/options/cookies_view.cc b/chrome/browser/views/options/cookies_view.cc
index 48de80f..2bba860 100644
--- a/chrome/browser/views/options/cookies_view.cc
+++ b/chrome/browser/views/options/cookies_view.cc
@@ -145,9 +145,9 @@ void CookiesView::ContentsChanged(views::Textfield* sender,
 
 bool CookiesView::HandleKeystroke(views::Textfield* sender,
                                   const views::Textfield::Keystroke& key) {
-  if (key.GetKeyboardCode() == base::VKEY_ESCAPE) {
+  if (key.GetKeyboardCode() == app::VKEY_ESCAPE) {
     ResetSearchQuery();
-  } else if (key.GetKeyboardCode() == base::VKEY_RETURN) {
+  } else if (key.GetKeyboardCode() == app::VKEY_RETURN) {
     search_update_factory_.RevokeAll();
     UpdateSearchResults();
   }
@@ -235,8 +235,8 @@ void CookiesView::OnTreeViewSelectionChanged(views::TreeView* tree_view) {
   }
 }
 
-void CookiesView::OnTreeViewKeyDown(base::KeyboardCode keycode) {
-  if (keycode == base::VKEY_DELETE)
+void CookiesView::OnTreeViewKeyDown(app::KeyboardCode keycode) {
+  if (keycode == app::VKEY_DELETE)
     cookies_tree_->RemoveSelectedItems();
 }
 
diff --git a/chrome/browser/views/options/cookies_view.h b/chrome/browser/views/options/cookies_view.h
index ce51933..121affd 100644
--- a/chrome/browser/views/options/cookies_view.h
+++ b/chrome/browser/views/options/cookies_view.h
@@ -71,7 +71,7 @@ class CookiesView : public CookiesTreeModel::Observer,
   virtual void OnTreeViewSelectionChanged(views::TreeView* tree_view);
 
   // views::TreeViewController implementation.
-  virtual void OnTreeViewKeyDown(base::KeyboardCode keycode);
+  virtual void OnTreeViewKeyDown(app::KeyboardCode keycode);
 
   // views::Textfield::Controller implementation.
   virtual void ContentsChanged(views::Textfield* sender,
diff --git a/chrome/browser/views/tab_contents/render_view_context_menu_views.cc b/chrome/browser/views/tab_contents/render_view_context_menu_views.cc
index f2092c5..8efb30b 100644
--- a/chrome/browser/views/tab_contents/render_view_context_menu_views.cc
+++ b/chrome/browser/views/tab_contents/render_view_context_menu_views.cc
@@ -4,8 +4,8 @@
 
 #include "chrome/browser/views/tab_contents/render_view_context_menu_views.h"
 
+#include "app/keyboard_codes.h"
 #include "base/compiler_specific.h"
-#include "base/keyboard_codes.h"
 #include "chrome/app/chrome_dll_resource.h"
 #include "chrome/browser/profile.h"
 #include "grit/generated_resources.h"
@@ -68,28 +68,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(base::VKEY_Z, false, true, false);
+      *accel = views::Accelerator(app::VKEY_Z, false, true, false);
       return true;
 
     case IDC_CONTENT_CONTEXT_REDO:
       // TODO(jcampan): should it be Ctrl-Y?
-      *accel = views::Accelerator(base::VKEY_Z, true, true, false);
+      *accel = views::Accelerator(app::VKEY_Z, true, true, false);
       return true;
 
     case IDC_CONTENT_CONTEXT_CUT:
-      *accel = views::Accelerator(base::VKEY_X, false, true, false);
+      *accel = views::Accelerator(app::VKEY_X, false, true, false);
       return true;
 
     case IDC_CONTENT_CONTEXT_COPY:
-      *accel = views::Accelerator(base::VKEY_C, false, true, false);
+      *accel = views::Accelerator(app::VKEY_C, false, true, false);
       return true;
 
     case IDC_CONTENT_CONTEXT_PASTE:
-      *accel = views::Accelerator(base::VKEY_V, false, true, false);
+      *accel = views::Accelerator(app::VKEY_V, false, true, false);
       return true;
 
     case IDC_CONTENT_CONTEXT_SELECTALL:
-      *accel = views::Accelerator(base::VKEY_A, false, true, false);
+      *accel = views::Accelerator(app::VKEY_A, false, true, false);
       return true;
 
     default:
diff --git a/chrome/browser/views/task_manager_view.cc b/chrome/browser/views/task_manager_view.cc
index d4bdbce..9a3e923 100644
--- a/chrome/browser/views/task_manager_view.cc
+++ b/chrome/browser/views/task_manager_view.cc
@@ -222,7 +222,7 @@ class TaskManagerView : public views::View,
   // views::TableViewObserver implementation.
   virtual void OnSelectionChanged();
   virtual void OnDoubleClick();
-  virtual void OnKeyDown(base::KeyboardCode keycode);
+  virtual void OnKeyDown(app::KeyboardCode keycode);
 
   // views::LinkController implementation.
   virtual void LinkActivated(views::Link* source, int event_flags);
@@ -372,7 +372,7 @@ void TaskManagerView::Init() {
   }
   kill_button_ = new views::NativeButton(
       this, l10n_util::GetString(IDS_TASK_MANAGER_KILL));
-  kill_button_->AddAccelerator(views::Accelerator(base::VKEY_E,
+  kill_button_->AddAccelerator(views::Accelerator(app::VKEY_E,
                                                   false, false, false));
   kill_button_->SetAccessibleKeyboardShortcut(L"E");
   about_memory_link_ = new views::Link(
@@ -588,8 +588,8 @@ void TaskManagerView::OnDoubleClick() {
   ActivateFocusedTab();
 }
 
-void TaskManagerView::OnKeyDown(base::KeyboardCode keycode) {
-  if (keycode == base::VKEY_RETURN)
+void TaskManagerView::OnKeyDown(app::KeyboardCode keycode) {
+  if (keycode == app::VKEY_RETURN)
     ActivateFocusedTab();
 }
 
diff --git a/chrome/browser/views/toolbar_view.cc b/chrome/browser/views/toolbar_view.cc
index baa4fdd..ccdc7e2 100644
--- a/chrome/browser/views/toolbar_view.cc
+++ b/chrome/browser/views/toolbar_view.cc
@@ -353,13 +353,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(base::VKEY_X, false, true, false);
+      *accelerator = views::Accelerator(app::VKEY_X, false, true, false);
       return true;
     case IDC_COPY:
-      *accelerator = views::Accelerator(base::VKEY_C, false, true, false);
+      *accelerator = views::Accelerator(app::VKEY_C, false, true, false);
       return true;
     case IDC_PASTE:
-      *accelerator = views::Accelerator(base::VKEY_V, false, true, false);
+      *accelerator = views::Accelerator(app::VKEY_V, false, true, false);
       return true;
   }
   // Else, we retrieve the accelerator information from the frame.
diff --git a/chrome/browser/views/unhandled_keyboard_event_handler.cc b/chrome/browser/views/unhandled_keyboard_event_handler.cc
index cc29354..9da60ee2 100644
--- a/chrome/browser/views/unhandled_keyboard_event_handler.cc
+++ b/chrome/browser/views/unhandled_keyboard_event_handler.cc
@@ -38,7 +38,7 @@ void UnhandledKeyboardEventHandler::HandleKeyboardEvent(
 
   if (event.type == WebKit::WebInputEvent::RawKeyDown) {
     views::Accelerator accelerator(
-        static_cast<base::KeyboardCode>(event.windowsKeyCode),
+        static_cast<app::KeyboardCode>(event.windowsKeyCode),
         (event.modifiers & NativeWebKeyboardEvent::ShiftKey) ==
             NativeWebKeyboardEvent::ShiftKey,
         (event.modifiers & NativeWebKeyboardEvent::ControlKey) ==
diff --git a/chrome/browser/views/url_picker.cc b/chrome/browser/views/url_picker.cc
index 3b9ac40..4051e63 100644
--- a/chrome/browser/views/url_picker.cc
+++ b/chrome/browser/views/url_picker.cc
@@ -4,10 +4,10 @@
 
 #include "chrome/browser/views/url_picker.h"
 
+#include "app/keyboard_codes.h"
 #include "app/l10n_util.h"
 #include "app/resource_bundle.h"
 #include "app/table_model.h"
-#include "base/keyboard_codes.h"
 #include "base/stl_util-inl.h"
 #include "base/string16.h"
 #include "base/utf_string_conversions.h"
@@ -113,7 +113,7 @@ UrlPicker::UrlPicker(UrlPickerDelegate* delegate,
 
   layout->AddPaddingRow(0, kRelatedControlVerticalSpacing);
 
-  AddAccelerator(views::Accelerator(base::VKEY_RETURN, false, false, false));
+  AddAccelerator(views::Accelerator(app::VKEY_RETURN, false, false, false));
 }
 
 UrlPicker::~UrlPicker() {