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

Unified Diff: views/event.h

Issue 6034002: Replace Textfield::Keystroke with views::KeyEvent (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: key_code, ET_KEY_PRESS for WM_CHAR Created 9 years, 12 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 | « views/controls/textfield/textfield.cc ('k') | views/event_win.cc » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: views/event.h
diff --git a/views/event.h b/views/event.h
index f878e2dbd4d11de651feb09d0c82adafa70d54d4..1ce8b9a5bbb3182e897e3e8fc1f4aa3df3d7d81c 100644
--- a/views/event.h
+++ b/views/event.h
@@ -332,12 +332,20 @@ class KeyEvent : public Event {
int event_flags,
int repeat_count,
int message_flags);
+
+#if defined(OS_WIN)
+ KeyEvent(EventType type,
+ app::KeyboardCode key_code,
+ int event_flags,
+ int repeat_count,
+ int message_flags,
+ UINT message);
+#endif
#if defined(OS_LINUX)
explicit KeyEvent(const GdkEventKey* event);
const GdkEventKey* native_event() const { return native_event_; }
#endif
-
#if defined(TOUCH_UI)
// Create a key event from an X key event.
explicit KeyEvent(XEvent* xevent);
@@ -353,6 +361,10 @@ class KeyEvent : public Event {
#if defined(OS_WIN)
bool IsExtendedKey() const;
+
+ UINT message() const {
+ return message_;
+ }
#endif
int GetRepeatCount() const {
@@ -360,7 +372,6 @@ class KeyEvent : public Event {
}
#if defined(OS_WIN)
- // Returns the current state of the KeyState.
static int GetKeyStateFlags();
#endif
@@ -369,7 +380,9 @@ class KeyEvent : public Event {
app::KeyboardCode key_code_;
int repeat_count_;
int message_flags_;
-#if defined(OS_LINUX)
+#if defined(OS_WIN)
+ UINT message_;
+#elif defined(OS_LINUX)
const GdkEventKey* native_event_;
#endif
DISALLOW_COPY_AND_ASSIGN(KeyEvent);
« no previous file with comments | « views/controls/textfield/textfield.cc ('k') | views/event_win.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698