Re-lands 58186:

views/accelerator.cc

 // Copyright (c) 2006-2008 The Chromium Authors. All rights reserved.
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
 #include "views/accelerator.h"
 
 #if defined(OS_WIN)
 #include <windows.h>
 #elif defined(OS_LINUX)
 #include <gdk/gdk.h>
 #endif
 
 #include "app/l10n_util.h"
 #include "base/i18n/rtl.h"
 #include "base/logging.h"
 #include "base/string_util.h"
 #include "base/utf_string_conversions.h"
 #include "grit/app_strings.h"
 
 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:
       break;
   }
 
   std::wstring shortcut;
   if (!string_id) {
 #if defined(OS_WIN)
     // Our fallback is to try translate the key code to a regular character
@@ skipping 71 matching lines @@
 
     // Subtracting the size of the shortcut key and 1 for the '+' sign.
     shortcut_rtl.append(shortcut, 0, shortcut.length() - key_length - 1);
     shortcut.swap(shortcut_rtl);
   }
 
   return shortcut;
 }
 
 }  // namespace views