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

Unified Diff: views/events/event_aura.cc

Issue 8190012: make browser_tests and interaction_ui_tests compile and link under use_aura=1 chromeos=0. (Closed) Base URL: http://git.chromium.org/git/chromium.git@trunk
Patch Set: Created 9 years, 2 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
« ui/base/clipboard/clipboard_aura.cc ('K') | « ui/base/clipboard/clipboard_aura.cc ('k') | no next file » | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
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());
}
////////////////////////////////////////////////////////////////////////////////
« ui/base/clipboard/clipboard_aura.cc ('K') | « ui/base/clipboard/clipboard_aura.cc ('k') | no next file » | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698