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

Unified Diff: ui/events/event.cc

Issue 404203003: Distinguish between keystroke and character events. (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: IsCharFromNative() for Mac build Created 6 years, 5 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 | « ui/events/event.h ('k') | ui/events/event_processor_unittest.cc » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: ui/events/event.cc
diff --git a/ui/events/event.cc b/ui/events/event.cc
index 898f98c207e2c5aa2119d370f54241394c37a386..348207d49c069a4c7f36d6b076f8eb654c0ce7ca 100644
--- a/ui/events/event.cc
+++ b/ui/events/event.cc
@@ -573,13 +573,13 @@ bool KeyEvent::IsRepeated(const KeyEvent& event) {
return false;
}
-KeyEvent::KeyEvent(const base::NativeEvent& native_event, bool is_char)
+KeyEvent::KeyEvent(const base::NativeEvent& native_event)
: Event(native_event,
EventTypeFromNative(native_event),
EventFlagsFromNative(native_event)),
key_code_(KeyboardCodeFromNative(native_event)),
code_(CodeFromNative(native_event)),
- is_char_(is_char),
+ is_char_(IsCharFromNative(native_event)),
platform_keycode_(PlatformKeycodeFromNative(native_event)),
character_(0) {
if (IsRepeated(*this))
@@ -592,11 +592,10 @@ KeyEvent::KeyEvent(const base::NativeEvent& native_event, bool is_char)
KeyEvent::KeyEvent(EventType type,
KeyboardCode key_code,
- int flags,
- bool is_char)
+ int flags)
: Event(type, EventTimeForNow(), flags),
key_code_(key_code),
- is_char_(is_char),
+ is_char_(false),
platform_keycode_(0),
character_(GetCharacterFromKeyCode(key_code, flags)) {
}
@@ -604,17 +603,24 @@ KeyEvent::KeyEvent(EventType type,
KeyEvent::KeyEvent(EventType type,
KeyboardCode key_code,
const std::string& code,
- int flags,
- bool is_char)
+ int flags)
: Event(type, EventTimeForNow(), flags),
key_code_(key_code),
code_(code),
- is_char_(is_char),
+ is_char_(false),
platform_keycode_(0),
character_(GetCharacterFromKeyCode(key_code, flags)) {
}
-uint16 KeyEvent::GetCharacter() const {
+KeyEvent::KeyEvent(base::char16 character, KeyboardCode key_code, int flags)
+ : Event(ET_KEY_PRESSED, EventTimeForNow(), flags),
+ key_code_(key_code),
+ code_(""),
+ is_char_(true),
+ character_(character) {
+}
+
+base::char16 KeyEvent::GetCharacter() const {
if (character_)
return character_;
« no previous file with comments | « ui/events/event.h ('k') | ui/events/event_processor_unittest.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698