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()) { |