Generate correct KeyboardCode (VKEY).

ui/events/ozone/layout/layout_util.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_LAYOUT_UTIL_H_
 #define UI_EVENTS_OZONE_LAYOUT_LAYOUT_UTIL_H_
 
 // TODO(kpschoedel): consider moving this out of Ozone.
 
 #include "base/strings/string16.h"
 #include "ui/events/keycodes/keyboard_codes.h"
 
 namespace ui {
 
 enum class DomCode;
 enum class DomKey;
 
+// Returns a Windows-based VKEY for a non-printable DOM Level 3 |key|.
+// The returned VKEY is non-located (e.g. VKEY_SHIFT).
+KeyboardCode NonPrintableDomKeyToKeyboardCode(DomKey dom_key);
+
 // Returns the Windows-based VKEY value corresponding to a DOM Level 3 |code|.
 // The returned VKEY is located (e.g. VKEY_LSHIFT).
 KeyboardCode DomCodeToKeyboardCode(DomCode dom_code);
 
-// Returns a Windows-based VKEY for a non-printable DOM Level 3 |key|.
+// Returns the Windows-based VKEY value corresponding to a DOM Level 3 |code|.
 // The returned VKEY is non-located (e.g. VKEY_SHIFT).
-KeyboardCode NonPrintableDomKeyToKeyboardCode(DomKey dom_key);
+KeyboardCode DomCodeToNonLocatedKeyboardCode(DomCode dom_code);
 
 // Determine the non-located VKEY corresponding to a located VKEY.
-KeyboardCode DeLocateKeyboardCode(KeyboardCode key_code);
+KeyboardCode NonLocatedKeyboardCode(KeyboardCode key_code);
+
+// Determine the located VKEY corresponding to a non-located VKEY.
+KeyboardCode LocatedKeyboardCode(KeyboardCode key_code, DomCode dom_code);
 
 // Returns true control character corresponding to a physical key.
 // In some contexts this is used instead of the key layout.
 bool LookupControlCharacter(DomCode dom_code,
                             int flags,
                             DomKey* dom_key,
                             base::char16* character,
                             KeyboardCode* key_code);
 
 }  // namespace ui
 
 #endif  // UI_EVENTS_OZONE_LAYOUT_LAYOUT_UTIL_H_