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

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: " Created 10 years 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.h ('k') | views/event.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..1263d96299db1c23d02b053c22410a4d639cb1d9 100644
--- a/views/event.h
+++ b/views/event.h
@@ -328,16 +328,24 @@ class KeyEvent : public Event {
public:
// Create a new key event
KeyEvent(EventType type,
- app::KeyboardCode key_code,
+ app::KeyboardCode keyboard_code,
int event_flags,
int repeat_count,
int message_flags);
+
+#if defined(OS_WIN)
+ KeyEvent(EventType type,
+ app::KeyboardCode keyboard_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);
@@ -348,11 +356,15 @@ class KeyEvent : public Event {
// On GTK, you can use the methods in keyboard_code_conversion_gtk.cc to
// convert this value back to a GDK value if needed.
app::KeyboardCode GetKeyCode() const {
oshima 2011/01/04 20:26:34 I think we should rename this to GetKeyboardCode t
- return key_code_;
+ return keyboard_code_;
}
#if defined(OS_WIN)
bool IsExtendedKey() const;
+
+ UINT message() const {
+ return message_;
+ }
#endif
int GetRepeatCount() const {
@@ -360,16 +372,17 @@ class KeyEvent : public Event {
}
#if defined(OS_WIN)
- // Returns the current state of the KeyState.
static int GetKeyStateFlags();
#endif
private:
- app::KeyboardCode key_code_;
+ app::KeyboardCode keyboard_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.h ('k') | views/event.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698