Located vs non-located ui::KeyboardCode functions.

ui/events/ozone/layout/layout_util.cc

 // Copyright 2014 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 "ui/events/ozone/layout/layout_util.h"
 
 #include <algorithm>
 
 #include "ui/events/event_constants.h"
 #include "ui/events/keycodes/dom3/dom_code.h"
 #include "ui/events/keycodes/dom3/dom_key.h"
+#include "ui/events/keycodes/keyboard_code_conversion.h"
 
 namespace ui {
 
 namespace {
 
-bool IsRightSideDomCode(DomCode code) {
-  return (code == DomCode::SHIFT_RIGHT) || (code == DomCode::CONTROL_RIGHT) ||
-         (code == DomCode::ALT_RIGHT) || (code == DomCode::OS_RIGHT);
-}
-
 // This table, used by DomKeyToKeyboardCode(), maps DOM Level 3 .code
 // values to legacy Windows-based VKEY values, where the VKEYs are
 // interpreted positionally.
 const struct DomCodeToKeyboardCodeEntry {
   DomCode dom_code;
   KeyboardCode key_code;
 } dom_code_to_keyboard_code[] = {
     // Entries are ordered by numeric value of the DomCode enum,
     // which is the USB physical key code.
     // DomCode::HYPER                              0x000010 Hyper
@@ skipping 427 matching lines @@
         return static_cast<int>(a.dom_code) < static_cast<int>(b);
       });
   if ((found != end) && (found->dom_code == dom_code))
     return found->key_code;
   return VKEY_UNKNOWN;
 }
 
 // Returns the Windows-based VKEY value corresponding to a DOM Level 3 |code|.
 // The returned VKEY is non-located (e.g. VKEY_SHIFT).
 KeyboardCode DomCodeToNonLocatedKeyboardCode(DomCode dom_code) {
-  return NonLocatedKeyboardCode(DomCodeToKeyboardCode(dom_code));
-}
-
-// Determine the non-located VKEY corresponding to a located VKEY.
-KeyboardCode NonLocatedKeyboardCode(KeyboardCode key_code) {
-  switch (key_code) {
-    case VKEY_RWIN:
-      return VKEY_LWIN;
-    case VKEY_LSHIFT:
-    case VKEY_RSHIFT:
-      return VKEY_SHIFT;
-    case VKEY_LCONTROL:
-    case VKEY_RCONTROL:
-      return VKEY_CONTROL;
-    case VKEY_LMENU:
-    case VKEY_RMENU:
-      return VKEY_MENU;
-    default:
-      return key_code;
-  }
-}
-
-// Determine the located VKEY corresponding to a non-located VKEY.
-KeyboardCode LocatedKeyboardCode(KeyboardCode key_code, DomCode dom_code) {
-  switch (key_code) {
-    case VKEY_SHIFT:
-      return IsRightSideDomCode(dom_code) ? VKEY_RSHIFT : VKEY_LSHIFT;
-    case VKEY_CONTROL:
-      return IsRightSideDomCode(dom_code) ? VKEY_RCONTROL : VKEY_LCONTROL;
-    case VKEY_MENU:
-      return IsRightSideDomCode(dom_code) ? VKEY_RMENU : VKEY_LMENU;
-    case VKEY_LWIN:
-      return IsRightSideDomCode(dom_code) ? VKEY_RWIN : VKEY_LWIN;
-    case VKEY_0:
-      return (dom_code == DomCode::NUMPAD0) ? VKEY_NUMPAD0 : VKEY_0;
-    case VKEY_1:
-      return (dom_code == DomCode::NUMPAD1) ? VKEY_NUMPAD1 : VKEY_1;
-    case VKEY_2:
-      return (dom_code == DomCode::NUMPAD2) ? VKEY_NUMPAD2 : VKEY_2;
-    case VKEY_3:
-      return (dom_code == DomCode::NUMPAD3) ? VKEY_NUMPAD3 : VKEY_3;
-    case VKEY_4:
-      return (dom_code == DomCode::NUMPAD4) ? VKEY_NUMPAD4 : VKEY_4;
-    case VKEY_5:
-      return (dom_code == DomCode::NUMPAD5) ? VKEY_NUMPAD5 : VKEY_5;
-    case VKEY_6:
-      return (dom_code == DomCode::NUMPAD6) ? VKEY_NUMPAD6 : VKEY_6;
-    case VKEY_7:
-      return (dom_code == DomCode::NUMPAD7) ? VKEY_NUMPAD7 : VKEY_7;
-    case VKEY_8:
-      return (dom_code == DomCode::NUMPAD8) ? VKEY_NUMPAD8 : VKEY_8;
-    case VKEY_9:
-      return (dom_code == DomCode::NUMPAD9) ? VKEY_NUMPAD9 : VKEY_9;
-    default:
-      return key_code;
-  }
+  return LocatedToNonLocatedKeyboardCode(DomCodeToKeyboardCode(dom_code));
 }
 
 bool LookupControlCharacter(DomCode dom_code,
                             int flags,
                             DomKey* dom_key,
                             base::char16* character,
                             KeyboardCode* key_code) {
   if ((flags & EF_CONTROL_DOWN) == 0)
     return false;
 
@@ skipping 91 matching lines @@
   //   DomKey::ACCEL
   //   DomKey::FN
   //   DomKey::FN_LOCK
   //   DomKey::NUM_LOCK
   //   DomKey::SCROLL_LOCK
   //   DomKey::SYMBOL
   //   DomKey::SYMBOL_LOCK
 }
 
 }  // namespace ui