Remove ui::KeyEvent::platform_keycode_

mojo/converters/input_events/input_events_type_converters.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 "mojo/converters/input_events/input_events_type_converters.h"
 
 #if defined(USE_X11)
 #include <X11/extensions/XInput2.h>
 #include <X11/Xlib.h>
 #endif
 
 #include "mojo/converters/geometry/geometry_type_converters.h"
 #include "mojo/converters/input_events/mojo_extended_key_event_data.h"
 #include "ui/events/event_utils.h"
+#include "ui/events/keycodes/dom/keycode_converter.h"
 #include "ui/events/keycodes/keyboard_codes.h"
 #include "ui/mojo/events/input_events.mojom.h"
 
 namespace mojo {
 namespace {
 
 ui::EventType MojoMouseEventTypeToUIEvent(const EventPtr& event) {
   DCHECK(!event->pointer_data.is_null());
   DCHECK_EQ(POINTER_KIND_MOUSE, event->pointer_data->kind);
   switch (event->action) {
@@ skipping 170 matching lines @@
     SetPointerDataLocationFromEvent(*touch_event, pointer_data.get());
     pointer_data->radius_major = touch_event->pointer_details().radius_x();
     pointer_data->radius_minor = touch_event->pointer_details().radius_y();
     pointer_data->pressure = touch_event->pointer_details().force();
     pointer_data->orientation = touch_event->rotation_angle();
     event->pointer_data = pointer_data.Pass();
   } else if (input.IsKeyEvent()) {
     const ui::KeyEvent* key_event = static_cast<const ui::KeyEvent*>(&input);
     KeyDataPtr key_data(KeyData::New());
     key_data->key_code = key_event->GetConflatedWindowsKeyCode();
-    key_data->native_key_code = key_event->platform_keycode();
+    key_data->native_key_code =
+      ui::KeycodeConverter::DomCodeToNativeKeycode(key_event->code());
     key_data->is_char = key_event->is_char();
     key_data->character = key_event->GetCharacter();
 
     if (key_event->extended_key_event_data()) {
       const MojoExtendedKeyEventData* data =
           static_cast<const MojoExtendedKeyEventData*>(
               key_event->extended_key_event_data());
       key_data->windows_key_code = static_cast<mojo::KeyboardCode>(
           data->windows_key_code());
       key_data->text = data->text();
@@ skipping 42 matching lines @@
                                                     : ui::ET_KEY_RELEASED,
 
             static_cast<ui::KeyboardCode>(input->key_data->key_code),
             input->flags));
       }
       key_event->SetExtendedKeyEventData(scoped_ptr<ui::ExtendedKeyEventData>(
           new MojoExtendedKeyEventData(
               static_cast<int32_t>(input->key_data->windows_key_code),
               input->key_data->text,
               input->key_data->unmodified_text)));
-      key_event->set_platform_keycode(input->key_data->native_key_code);
       return key_event.Pass();
     }
     case EVENT_TYPE_POINTER_DOWN:
     case EVENT_TYPE_POINTER_UP:
     case EVENT_TYPE_POINTER_MOVE:
     case EVENT_TYPE_POINTER_CANCEL: {
       if (input->pointer_data->kind == POINTER_KIND_MOUSE) {
         // TODO: last flags isn't right. Need to send changed_flags.
         scoped_ptr<ui::MouseEvent> event(new ui::MouseEvent(
             MojoMouseEventTypeToUIEvent(input), location, screen_location,
@@ skipping 20 matching lines @@
       return touch_event.Pass();
     }
     default:
       NOTIMPLEMENTED();
   }
   // TODO: need to support time_stamp.
   return nullptr;
 }
 
 }  // namespace mojo