Index: views/events/event_aura.cc |
diff --git a/views/events/event_aura.cc b/views/events/event_aura.cc |
index fc6d530e718099b073c461c9cda8d80744c66ad7..0685bdd14184746593f63494e2f260f39bd62481 100644 |
--- a/views/events/event_aura.cc |
+++ b/views/events/event_aura.cc |
@@ -21,18 +21,31 @@ LocatedEvent::LocatedEvent(const NativeEvent& native_event) |
// KeyEvent, public: |
KeyEvent::KeyEvent(const NativeEvent& native_event) |
- : Event(native_event, native_event->type(), native_event->flags()), |
- key_code_(static_cast<aura::KeyEvent*>(native_event)->key_code()), |
- character_(0), |
- unmodified_character_(0) { |
-} |
+ : Event(native_event, native_event->type(), native_event->flags()), |
+ key_code_(static_cast<aura::KeyEvent*>(native_event)->key_code()), |
+ character_(0), |
+ unmodified_character_(GetCharacterFromKeyCode( |
+ key_code_, |
+ static_cast<aura::KeyEvent*>(native_event)->flags())) { |
+ } |
+ |
+//KeyEvent::KeyEvent(const NativeEvent& native_event) |
+// : Event(native_event->type(), native_event->flags()), |
+// key_code_(static_cast<aura::KeyEvent*>(native_event)->key_code()), |
+// unmodified_character_(0) { |
+// character_ = GetCharacterFromKeyCode(key_code_, native_event->flags()); } |
+// character_(0), |
+// unmodified_character_(0) { |
+// } |
Emmanuel Saint-loubert-Bié
2011/10/07 14:19:10
remove old code
alicet1
2011/10/07 15:30:31
oh, actually, this file should not be included, so
|
uint16 KeyEvent::GetCharacter() const { |
return character_; |
} |
uint16 KeyEvent::GetUnmodifiedCharacter() const { |
- return unmodified_character_; |
+ if (unmodified_character_) |
+ return unmodified_character_; |
+ return GetCharacterFromKeyCode(key_code(), flags()); |
} |
//////////////////////////////////////////////////////////////////////////////// |