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

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 {
 
 string16 Accelerator::GetShortcutText() const {
   int string_id = 0;
   switch(key_code_) {
-    case app::VKEY_TAB:
+    case ui::VKEY_TAB:
       string_id = IDS_APP_TAB_KEY;
       break;
-    case app::VKEY_RETURN:
+    case ui::VKEY_RETURN:
       string_id = IDS_APP_ENTER_KEY;
       break;
-    case app::VKEY_ESCAPE:
+    case ui::VKEY_ESCAPE:
       string_id = IDS_APP_ESC_KEY;
       break;
-    case app::VKEY_PRIOR:
+    case ui::VKEY_PRIOR:
       string_id = IDS_APP_PAGEUP_KEY;
       break;
-    case app::VKEY_NEXT:
+    case ui::VKEY_NEXT:
       string_id = IDS_APP_PAGEDOWN_KEY;
       break;
-    case app::VKEY_END:
+    case ui::VKEY_END:
       string_id = IDS_APP_END_KEY;
       break;
-    case app::VKEY_HOME:
+    case ui::VKEY_HOME:
       string_id = IDS_APP_HOME_KEY;
       break;
-    case app::VKEY_INSERT:
+    case ui::VKEY_INSERT:
       string_id = IDS_APP_INSERT_KEY;
       break;
-    case app::VKEY_DELETE:
+    case ui::VKEY_DELETE:
       string_id = IDS_APP_DELETE_KEY;
       break;
-    case app::VKEY_LEFT:
+    case ui::VKEY_LEFT:
       string_id = IDS_APP_LEFT_ARROW_KEY;
       break;
-    case app::VKEY_RIGHT:
+    case ui::VKEY_RIGHT:
       string_id = IDS_APP_RIGHT_ARROW_KEY;
       break;
-    case app::VKEY_BACK:
+    case ui::VKEY_BACK:
       string_id = IDS_APP_BACKSPACE_KEY;
       break;
-    case app::VKEY_F1:
+    case ui::VKEY_F1:
       string_id = IDS_APP_F1_KEY;
       break;
-    case app::VKEY_F11:
+    case ui::VKEY_F11:
       string_id = IDS_APP_F11_KEY;
       break;
     default:
       break;
   }
 
   string16 shortcut;
   if (!string_id) {
 #if defined(OS_WIN)
     // Our fallback is to try translate the key code to a regular character
     // unless it is one of digits (VK_0 to VK_9). Some keyboard
     // layouts have characters other than digits assigned in
     // an unshifted mode (e.g. French AZERY layout has 'a with grave
     // accent' for '0'). For display in the menu (e.g. Ctrl-0 for the
     // default zoom level), we leave VK_[0-9] alone without translation.
     wchar_t key;
     if (key_code_ >= '0' && key_code_ <= '9')
       key = key_code_;
     else
       key = LOWORD(::MapVirtualKeyW(key_code_, MAPVK_VK_TO_CHAR));
     shortcut += key;
 #elif defined(OS_LINUX)
     const gchar* name = NULL;
     switch (key_code_) {
-      case app::VKEY_OEM_2:
+      case ui::VKEY_OEM_2:
         name = static_cast<const gchar*>("/");
         break;
       default:
         name = gdk_keyval_name(gdk_keyval_to_lower(key_code_));
         break;
     }
     if (name) {
       if (name[0] != 0 && name[1] == 0)
         shortcut += static_cast<string16::value_type>(g_ascii_toupper(name[0]));
       else
@@ skipping 54 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