diff options
Diffstat (limited to 'mojo/services')
| -rw-r--r-- | mojo/services/native_viewport/platform_viewport_x11.cc | 6 | ||||
| -rw-r--r-- | mojo/services/public/cpp/input_events/lib/input_events_type_converters.cc | 16 |
2 files changed, 13 insertions, 9 deletions
diff --git a/mojo/services/native_viewport/platform_viewport_x11.cc b/mojo/services/native_viewport/platform_viewport_x11.cc index d4914c7..dbf7fb8 100644 --- a/mojo/services/native_viewport/platform_viewport_x11.cc +++ b/mojo/services/native_viewport/platform_viewport_x11.cc @@ -104,9 +104,9 @@ class PlatformViewportX11 : public PlatformViewport, char_event.SetExtendedKeyEventData(scoped_ptr<ui::ExtendedKeyEventData>( new MojoExtendedKeyEventData( - key_press_event->GetLocatedWindowsKeyboardCode(), - key_press_event->GetText(), - key_press_event->GetUnmodifiedText()))); + ui::WindowsKeycodeFromNative(key_press_event->native_event()), + ui::TextFromNative(key_press_event->native_event()), + ui::UnmodifiedTextFromNative(key_press_event->native_event())))); char_event.set_platform_keycode(key_press_event->platform_keycode()); delegate_->OnEvent(&char_event); diff --git a/mojo/services/public/cpp/input_events/lib/input_events_type_converters.cc b/mojo/services/public/cpp/input_events/lib/input_events_type_converters.cc index 340e200..4520aa4 100644 --- a/mojo/services/public/cpp/input_events/lib/input_events_type_converters.cc +++ b/mojo/services/public/cpp/input_events/lib/input_events_type_converters.cc @@ -119,12 +119,18 @@ EventPtr TypeConverter<EventPtr, ui::Event>::Convert(const ui::Event& input) { } 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->key_code = key_event->key_code(); key_data->native_key_code = key_event->platform_keycode(); key_data->is_char = key_event->is_char(); key_data->character = key_event->GetCharacter(); - if (key_event->extended_key_event_data()) { + if (key_event->HasNativeEvent()) { + key_data->windows_key_code = static_cast<mojo::KeyboardCode>( + ui::WindowsKeycodeFromNative(key_event->native_event())); + key_data->text = ui::TextFromNative(key_event->native_event()); + key_data->unmodified_text = + ui::UnmodifiedTextFromNative(key_event->native_event()); + } else if (key_event->extended_key_event_data()) { const MojoExtendedKeyEventData* data = static_cast<const MojoExtendedKeyEventData*>( key_event->extended_key_event_data()); @@ -133,10 +139,8 @@ EventPtr TypeConverter<EventPtr, ui::Event>::Convert(const ui::Event& input) { key_data->text = data->text(); key_data->unmodified_text = data->unmodified_text(); } else { - key_data->windows_key_code = static_cast<mojo::KeyboardCode>( - key_event->GetLocatedWindowsKeyboardCode()); - key_data->text = key_event->GetText(); - key_data->unmodified_text = key_event->GetUnmodifiedText(); + NOTREACHED() << "Synthesized event which never contained a native event " + "passed to mojo::TypeConverter."; } event->key_data = key_data.Pass(); |