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

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: Created 6 years, 4 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
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 d7ae1f03ff456b8c419fbd67f9278b92b0f85281..dc62660d61a94cbb6b2670b7bc292be5602e0daa 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
@@ -123,7 +123,8 @@ 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->is_char() ? key_event->GetCharacter()
+ : key_event->key_code();
key_data->is_char = key_event->is_char();
event->key_data = key_data.Pass();
} else if (input.IsMouseWheelEvent()) {

Powered by Google App Engine
This is Rietveld 408576698