Generate non-located windowsKeyCode for the WebInputEvents.

content/browser/renderer_host/input/web_input_event_builders_android.cc

 // Copyright 2013 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 "content/browser/renderer_host/input/web_input_event_builders_android.h"
 
 #include "base/logging.h"
 #include "content/browser/renderer_host/input/motion_event_android.h"
 #include "content/browser/renderer_host/input/web_input_event_util.h"
-#include "content/browser/renderer_host/input/web_input_event_util_posix.h"
+#include "ui/events/keycodes/dom/keycode_converter.h"
+#include "ui/events/keycodes/keyboard_code_conversion.h"
 #include "ui/events/keycodes/keyboard_code_conversion_android.h"
 #include "ui/events/keycodes/keyboard_codes_posix.h"
 
 using blink::WebInputEvent;
 using blink::WebKeyboardEvent;
 using blink::WebGestureEvent;
 using blink::WebMouseEvent;
 using blink::WebMouseWheelEvent;
 using blink::WebTouchEvent;
 using blink::WebTouchPoint;
 
 namespace content {
 
 WebKeyboardEvent WebKeyboardEventBuilder::Build(WebInputEvent::Type type,
                                                 int modifiers,
                                                 double time_sec,
                                                 int keycode,
                                                 int unicode_character,
                                                 bool is_system_key) {
   DCHECK(WebInputEvent::isKeyboardEventType(type));
   WebKeyboardEvent result;
 
+  ui::DomCode dom_code = ui::KeycodeConverter::NativeKeycodeToDomCode(keycode);
   result.type = type;
   result.modifiers = modifiers;
   result.timeStampSeconds = time_sec;
-  ui::KeyboardCode windows_key_code =
-      ui::KeyboardCodeFromAndroidKeyCode(keycode);
-  UpdateWindowsKeyCodeAndKeyIdentifier(&result, windows_key_code);
-  result.modifiers |= GetLocationModifiersFromWindowsKeyCode(windows_key_code);
+  result.windowsKeyCode = ui::LocatedToNonLocatedKeyboardCode(
+      ui::DomCodeToUsLayoutKeyboardCode(dom_code));
+  result.modifiers |= DomCodeToWebInputEventModifiers(dom_code);
   result.nativeKeyCode = keycode;
   result.unmodifiedText[0] = unicode_character;
   if (result.windowsKeyCode == ui::VKEY_RETURN) {
     // This is the same behavior as GTK:
     // We need to treat the enter key as a key press of character \r. This
     // is apparently just how webkit handles it and what it expects.
     result.unmodifiedText[0] = '\r';
   }
   result.text[0] = result.unmodifiedText[0];
   result.isSystemKey = is_system_key;
+  result.setKeyIdentifierFromWindowsKeyCode();
 
   return result;
 }
 
 WebMouseEvent WebMouseEventBuilder::Build(blink::WebInputEvent::Type type,
                                           WebMouseEvent::Button button,
                                           double time_sec,
                                           int window_x,
                                           int window_y,
                                           int modifiers,
@@ skipping 52 matching lines @@
   result.type = type;
   result.x = x;
   result.y = y;
   result.timeStampSeconds = time_sec;
   result.sourceDevice = blink::WebGestureDeviceTouchscreen;
 
   return result;
 }
 
 }  // namespace content