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

ui/events/ozone/layout/xkb/xkb_keyboard_layout_engine.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/xkb/xkb_keyboard_layout_engine.h"
 
 #include <xkbcommon/xkbcommon-names.h>
 
 #include "base/bind.h"
 #include "base/location.h"
@@ skipping 639 matching lines @@
     scoped_ptr<char, base::FreeDeleter> keymap_str(
         xkb_keymap_get_as_string(keymap.get(), XKB_KEYMAP_FORMAT_TEXT_V1));
     reply_runner->PostTask(FROM_HERE, base::Bind(reply_callback, layout_name,
                                                  base::Passed(&keymap_str)));
   } else {
     LOG(FATAL) << "Keymap file failed to load: " << 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() {
 }
 
 XkbKeyCodeConverter::~XkbKeyCodeConverter() {
 }
 
 XkbKeyboardLayoutEngine::XkbKeyboardLayoutEngine(
     const XkbKeyCodeConverter& converter)
@@ skipping 98 matching lines @@
   *platform_keycode = xkb_keysym;
   // Classify the keysym and convert to DOM and VKEY representations.
   *dom_key = NonPrintableXkbKeySymToDomKey(xkb_keysym);
   if (*dom_key == DomKey::NONE) {
     *dom_key = CharacterToDomKey(*character);
     *key_code = AlphanumericKeyboardCode(*character);
     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 = DomCodeToNonLocatedKeyboardCode(dom_code);
+        *key_code = DomCodeToUsLayoutKeyboardCode(dom_code);
     }
 
     if ((flags & EF_CONTROL_DOWN) == EF_CONTROL_DOWN) {
-      // Use GetCharacterFromKeyCode() to set |character| to 0x0 for key codes
-      // that we do not care about.
+      // Use GetCharacterFromKeyCode() to set |character| to 0x0 for keys that
+      // are not part of the accepted set of Control+Key combinations.
       *character = GetCharacterFromKeyCode(*key_code, flags);
     }
   } else if (*dom_key == DomKey::DEAD) {
     *character = DeadXkbKeySymToCombiningCharacter(xkb_keysym);
-    *key_code = DomCodeToNonLocatedKeyboardCode(dom_code);
+    *key_code = DomCodeToUsLayoutKeyboardCode(dom_code);
   } else {
     *key_code = NonPrintableDomKeyToKeyboardCode(*dom_key);
     if (*key_code == VKEY_UNKNOWN)
-      *key_code = DomCodeToNonLocatedKeyboardCode(dom_code);
+      *key_code = DomCodeToUsLayoutKeyboardCode(dom_code);
   }
   return true;
 }
 
 void XkbKeyboardLayoutEngine::SetKeymap(xkb_keymap* keymap) {
   xkb_state_.reset(xkb_state_new(keymap));
   // Update flag map.
   static const struct {
     int ui_flag;
     const char* xkb_name;
@@ skipping 155 matching lines @@
     if (close_index == std::string::npos)
       close_index = layout_name.size();
     *layout_variant = layout_name.substr(parentheses_index + 1,
                                          close_index - parentheses_index - 1);
   } else if (dash_index != std::string::npos) {
     *layout_id = layout_name.substr(0, dash_index);
     *layout_variant = layout_name.substr(dash_index + 1);
   }
 }
 }  // namespace ui