Finish refactoring of DomCodeToUsLayoutKeyboardCode().

A previous inadvertently left two private copies of this in different
places with slightly different behaviour.

BUG=chrome-os-partner:42619

Review URL: https://codereview.chromium.org/1233663006

Cr-Commit-Position: refs/heads/master@{#339447}

1 files changed, 10 insertions, 16 deletions

diff --git a/ui/events/ozone/layout/xkb/xkb_keyboard_layout_engine.cc b/ui/events/ozone/layout/xkb/xkb_keyboard_layout_engine.cc
index 4d1b8b8..3e393dc8 100644
--- a/ui/events/ozone/layout/xkb/xkb_keyboard_layout_engine.cc
+++ b/ui/events/ozone/layout/xkb/xkb_keyboard_layout_engine.cc
@@ -628,17 +628,6 @@ void LoadKeymap(const std::string& layout_name,
 }
 #endif
 
-KeyboardCode DomCodeToUsLayoutKeyboardCode(DomCode dom_code) {
-  DomKey dummy_dom_key;
-  base::char16 dummy_character;
-  KeyboardCode key_code;
-  if (DomCodeToUsLayoutMeaning(dom_code, EF_NONE, &dummy_dom_key,
-                               &dummy_character, &key_code)) {
-    return key_code;
-  }
-  return VKEY_UNKNOWN;
-}
-
 }  // anonymous namespace
 
 XkbKeyCodeConverter::XkbKeyCodeConverter() {
@@ -754,8 +743,10 @@ bool XkbKeyboardLayoutEngine::Lookup(DomCode dom_code,
     if (*key_code == VKEY_UNKNOWN) {
       *key_code = DifficultKeyboardCode(dom_code, flags, xkb_keycode, xkb_flags,
                                         xkb_keysym, *dom_key, *character);
-      if (*key_code == VKEY_UNKNOWN)
-        *key_code = DomCodeToUsLayoutKeyboardCode(dom_code);
+      if (*key_code == VKEY_UNKNOWN) {
+        *key_code = LocatedToNonLocatedKeyboardCode(
+            DomCodeToUsLayoutKeyboardCode(dom_code));
+      }
     }
     // If the Control key is down, only allow ASCII control characters to be
     // returned, regardless of the key layout. crbug.com/450849
@@ -763,11 +754,14 @@ bool XkbKeyboardLayoutEngine::Lookup(DomCode dom_code,
       *character = 0;
   } else if (*dom_key == DomKey::DEAD) {
     *character = DeadXkbKeySymToCombiningCharacter(xkb_keysym);
-    *key_code = DomCodeToUsLayoutKeyboardCode(dom_code);
+    *key_code = LocatedToNonLocatedKeyboardCode(
+        DomCodeToUsLayoutKeyboardCode(dom_code));
   } else {
     *key_code = NonPrintableDomKeyToKeyboardCode(*dom_key);
-    if (*key_code == VKEY_UNKNOWN)
-      *key_code = DomCodeToUsLayoutKeyboardCode(dom_code);
+    if (*key_code == VKEY_UNKNOWN) {
+      *key_code = LocatedToNonLocatedKeyboardCode(
+          DomCodeToUsLayoutKeyboardCode(dom_code));
+    }
   }
   return true;
 }