| 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 {
|
| - 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);
|
|
|