Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(1642)

Unified Diff: mojo/services/public/cpp/input_events/lib/input_events_type_converters.cc

Issue 479873002: Removing X11 native_event uses for key events. (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: Remove web_input_event_aurax11.cc from Android license whitelist. Created 6 years, 3 months ago
Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.
Jump to:
View side-by-side diff with in-line comments
Download patch
« no previous file with comments | « mojo/services/native_viewport/platform_viewport_x11.cc ('k') | ui/events/event.h » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: mojo/services/public/cpp/input_events/lib/input_events_type_converters.cc
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 a4bd3307d45a9fcc86d3dd8730f59faa848e7ac2..98f6ec4795529472a3c49497179c756790003d5a 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
@@ -128,18 +128,12 @@ EventPtr TypeConverter<EventPtr, ui::Event>::ConvertFrom(
} 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->key_code();
+ key_data->key_code = key_event->GetConflatedWindowsKeyCode();
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->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()) {
+ if (key_event->extended_key_event_data()) {
const MojoExtendedKeyEventData* data =
static_cast<const MojoExtendedKeyEventData*>(
key_event->extended_key_event_data());
@@ -148,8 +142,10 @@ EventPtr TypeConverter<EventPtr, ui::Event>::ConvertFrom(
key_data->text = data->text();
key_data->unmodified_text = data->unmodified_text();
} else {
- NOTREACHED() << "Synthesized event which never contained a native event "
- "passed to mojo::TypeConverter.";
+ 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();
}
event->key_data = key_data.Pass();
« no previous file with comments | « mojo/services/native_viewport/platform_viewport_x11.cc ('k') | ui/events/event.h » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698