Generate non-located windowsKeyCode for the WebInputEvents.

content/browser/renderer_host/web_input_event_aura.cc

 // Copyright (c) 2012 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/web_input_event_aura.h"
 
 #include "content/browser/renderer_host/input/web_input_event_util.h"
 #include "content/browser/renderer_host/ui_events_helper.h"
 #include "ui/aura/client/screen_position_client.h"
 #include "ui/aura/window.h"
@@ skipping 15 matching lines @@
   aura::client::ScreenPositionClient* spc =
       aura::client::GetScreenPositionClient(root);
   if (!spc)
     return event.root_location();
 
   gfx::Point screen_location(event.root_location());
   spc->ConvertPointToScreen(root, &screen_location);
   return screen_location;
 }
 
-blink::WebInputEvent::Modifiers DomCodeToWebInputEventModifiers(
-    ui::DomCode code) {
-  switch (ui::KeycodeConverter::DomCodeToLocation(code)) {
-    case ui::DomKeyLocation::LEFT:
-      return blink::WebInputEvent::IsLeft;
-    case ui::DomKeyLocation::RIGHT:
-      return blink::WebInputEvent::IsRight;
-    case ui::DomKeyLocation::NUMPAD:
-      return blink::WebInputEvent::IsKeyPad;
-    case ui::DomKeyLocation::STANDARD:
-      break;
-  }
-  return static_cast<blink::WebInputEvent::Modifiers>(0);
-}
-
 }  // namespace
 
 #if defined(OS_WIN)
 blink::WebMouseEvent MakeUntranslatedWebMouseEventFromNativeEvent(
     const base::NativeEvent& native_event);
 blink::WebMouseWheelEvent MakeUntranslatedWebMouseWheelEventFromNativeEvent(
     const base::NativeEvent& native_event);
 blink::WebKeyboardEvent MakeWebKeyboardEventFromNativeEvent(
     const base::NativeEvent& native_event);
 blink::WebGestureEvent MakeWebGestureEventFromNativeEvent(
@@ skipping 16 matching lines @@
     case ui::ET_KEY_RELEASED:
       webkit_event.type = blink::WebInputEvent::KeyUp;
       break;
     default:
       NOTREACHED();
   }
 
   if (webkit_event.modifiers & blink::WebInputEvent::AltKey)
     webkit_event.isSystemKey = true;
 
-  webkit_event.windowsKeyCode = event.GetLocatedWindowsKeyboardCode();
+  webkit_event.windowsKeyCode = event.key_code();
   webkit_event.nativeKeyCode =
     ui::KeycodeConverter::DomCodeToNativeKeycode(event.code());
   webkit_event.domCode = static_cast<int>(event.code());
   webkit_event.unmodifiedText[0] = event.GetUnmodifiedText();
   webkit_event.text[0] = event.GetText();
 
   webkit_event.setKeyIdentifierFromWindowsKeyCode();
 
   return webkit_event;
 }
@@ skipping 301 matching lines @@
     webkit_event.deltaY = event.y_offset();
   }
 
   webkit_event.wheelTicksX = webkit_event.deltaX / kPixelsPerTick;
   webkit_event.wheelTicksY = webkit_event.deltaY / kPixelsPerTick;
 
   return webkit_event;
 }
 
 }  // namespace content