Use DOM- rather than Windows-based key code for non-layout cases.

ui/events/ozone/layout/xkb/xkb_keyboard_layout_engine.h

 // 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.
 
 #ifndef UI_EVENTS_OZONE_LAYOUT_XKB_XKB_KEYBOARD_LAYOUT_ENGINE_H_
 #define UI_EVENTS_OZONE_LAYOUT_XKB_XKB_KEYBOARD_LAYOUT_ENGINE_H_
 
 #include <xkbcommon/xkbcommon.h>
 #include <vector>
 
@@ skipping 40 matching lines @@
     int ui_flag;
     xkb_mod_mask_t xkb_flag;
   };
   std::vector<XkbFlagMapEntry> xkb_flag_map_;
 
   // Flag mask for num lock, which is always considered enabled.
   xkb_mod_mask_t num_lock_mod_mask_;
 
   // Determines the Windows-based KeyboardCode (VKEY) for a character key,
   // accounting for non-US layouts. May return VKEY_UNKNOWN, in which case the
-  // caller should use |DomCodeToNonLocatedKeyboardCode()| as a last resort.
+  // caller should, as a last resort, obtain a KeyboardCode using
+  // |DomCodeToUsLayoutMeaning()|.
   KeyboardCode DifficultKeyboardCode(DomCode dom_code,
                                      int ui_flags,
                                      xkb_keycode_t xkb_keycode,
                                      xkb_mod_mask_t xkb_flags,
                                      xkb_keysym_t xkb_keysym,
                                      DomKey dom_key,
                                      base::char16 character) const;
 
   // Maps DomCode to xkb_keycode_t.
   const XkbKeyCodeConverter& key_code_converter_;
@@ skipping 37 matching lines @@
 
   std::string current_layout_name_;
 
   // Support weak pointers for attach & detach callbacks.
   base::WeakPtrFactory<XkbKeyboardLayoutEngine> weak_ptr_factory_;
 };
 
 }  // namespace ui
 
 #endif  // UI_EVENTS_OZONE_LAYOUT_XKB_XKB_KEYBOARD_LAYOUT_ENGINE_H_