Re-lands 58186:

views/accelerator.cc

Index: views/accelerator.cc
diff --git a/views/accelerator.cc b/views/accelerator.cc
index 730191d4427b77b0827c631eabfe56bdc992b902..6b80cc424ef0bab9b3ab1b870a66e324f8c1ffef 100644
--- a/views/accelerator.cc
+++ b/views/accelerator.cc
@@ -22,46 +22,46 @@ namespace views {
 std::wstring Accelerator::GetShortcutText() const {
   int string_id = 0;
   switch(key_code_) {
-    case base::VKEY_TAB:
+    case app::VKEY_TAB:
       string_id = IDS_APP_TAB_KEY;
       break;
-    case base::VKEY_RETURN:
+    case app::VKEY_RETURN:
       string_id = IDS_APP_ENTER_KEY;
       break;
-    case base::VKEY_ESCAPE:
+    case app::VKEY_ESCAPE:
       string_id = IDS_APP_ESC_KEY;
       break;
-    case base::VKEY_PRIOR:
+    case app::VKEY_PRIOR:
       string_id = IDS_APP_PAGEUP_KEY;
       break;
-    case base::VKEY_NEXT:
+    case app::VKEY_NEXT:
       string_id = IDS_APP_PAGEDOWN_KEY;
       break;
-    case base::VKEY_END:
+    case app::VKEY_END:
       string_id = IDS_APP_END_KEY;
       break;
-    case base::VKEY_HOME:
+    case app::VKEY_HOME:
       string_id = IDS_APP_HOME_KEY;
       break;
-    case base::VKEY_INSERT:
+    case app::VKEY_INSERT:
       string_id = IDS_APP_INSERT_KEY;
       break;
-    case base::VKEY_DELETE:
+    case app::VKEY_DELETE:
       string_id = IDS_APP_DELETE_KEY;
       break;
-    case base::VKEY_LEFT:
+    case app::VKEY_LEFT:
       string_id = IDS_APP_LEFT_ARROW_KEY;
       break;
-    case base::VKEY_RIGHT:
+    case app::VKEY_RIGHT:
       string_id = IDS_APP_RIGHT_ARROW_KEY;
       break;
-    case base::VKEY_BACK:
+    case app::VKEY_BACK:
       string_id = IDS_APP_BACKSPACE_KEY;
       break;
-    case base::VKEY_F1:
+    case app::VKEY_F1:
       string_id = IDS_APP_F1_KEY;
       break;
-    case base::VKEY_F11:
+    case app::VKEY_F11:
       string_id = IDS_APP_F11_KEY;
       break;
     default: