diff options
author | jcampan@chromium.org <jcampan@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2009-09-28 21:32:30 +0000 |
---|---|---|
committer | jcampan@chromium.org <jcampan@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2009-09-28 21:32:30 +0000 |
commit | a4d271ecbea5ed763d49919fac7bfabe788832f6 (patch) | |
tree | c646a4d085142007968138c7ad26d1fb2aafe6a9 /views/event.h | |
parent | 19ff283d0e043c59206fdc2e890a2780933849fe (diff) | |
download | chromium_src-a4d271ecbea5ed763d49919fac7bfabe788832f6.zip chromium_src-a4d271ecbea5ed763d49919fac7bfabe788832f6.tar.gz chromium_src-a4d271ecbea5ed763d49919fac7bfabe788832f6.tar.bz2 |
Reverting 27412 it breaks the toolkit views Linux build.
TBR=sky
Review URL: http://codereview.chromium.org/254005
git-svn-id: svn://svn.chromium.org/chrome/trunk/src@27416 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'views/event.h')
-rw-r--r-- | views/event.h | 12 |
1 files changed, 4 insertions, 8 deletions
diff --git a/views/event.h b/views/event.h index 138327d..5a6efd9 100644 --- a/views/event.h +++ b/views/event.h @@ -7,7 +7,6 @@ #include "base/basictypes.h" #include "base/gfx/point.h" -#include "base/keyboard_codes.h" #if defined(OS_LINUX) typedef struct _GdkEventKey GdkEventKey; @@ -243,10 +242,7 @@ class KeyEvent : public Event { public: #if defined(OS_WIN) // Create a new key event - KeyEvent(EventType type, - base::KeyboardCode key_code, - int repeat_count, - int message_flags); + KeyEvent(EventType type, int ch, int repeat_count, int message_flags); #elif defined(OS_LINUX) explicit KeyEvent(GdkEventKey* event); #endif @@ -255,8 +251,8 @@ class KeyEvent : public Event { // the Windows value. // On GTK, you can use the methods in keyboard_code_conversion_gtk.cc to // convert this value back to a GDK value if needed. - base::KeyboardCode GetKeyCode() const { - return key_code_; + int GetCharacter() const { + return character_; } #if defined(OS_WIN) @@ -272,7 +268,7 @@ class KeyEvent : public Event { int GetKeyStateFlags() const; #endif - base::KeyboardCode key_code_; + int character_; int repeat_count_; int message_flags_; |