diff options
| author | erg@google.com <erg@google.com@0039d316-1c4b-4281-b951-d872f2087c98> | 2009-02-25 23:42:30 +0000 |
|---|---|---|
| committer | erg@google.com <erg@google.com@0039d316-1c4b-4281-b951-d872f2087c98> | 2009-02-25 23:42:30 +0000 |
| commit | f7ed3f4d1f9e693ba7d8ae2a9ec2d6fd93b46453 (patch) | |
| tree | 0e08453fa076c1bc0df3e84265cfe5e1a2913298 /webkit | |
| parent | 8abcab400b5a1bf486bdaa7d8d77b94dfc0f0bc9 (diff) | |
| download | chromium_src-f7ed3f4d1f9e693ba7d8ae2a9ec2d6fd93b46453.zip chromium_src-f7ed3f4d1f9e693ba7d8ae2a9ec2d6fd93b46453.tar.gz chromium_src-f7ed3f4d1f9e693ba7d8ae2a9ec2d6fd93b46453.tar.bz2 | |
Revert "Implement accelerators in the gtk port" at avi's request.
This reverts commit 1dbbeb791d5a9ae0740afb5d7eb57710c93b7f38.
git-svn-id: svn://svn.chromium.org/chrome/trunk/src@10403 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'webkit')
| -rw-r--r-- | webkit/glue/webinputevent.h | 7 | ||||
| -rw-r--r-- | webkit/glue/webinputevent_linux.cc | 4 |
2 files changed, 1 insertions, 10 deletions
diff --git a/webkit/glue/webinputevent.h b/webkit/glue/webinputevent.h index c8099c8f..9a1c84d 100644 --- a/webkit/glue/webinputevent.h +++ b/webkit/glue/webinputevent.h @@ -19,7 +19,6 @@ class NSEvent; class NSView; #endif // __OBJC__ #elif defined(OS_LINUX) -#include <glib.h> typedef struct _GdkEventButton GdkEventButton; typedef struct _GdkEventMotion GdkEventMotion; typedef struct _GdkEventScroll GdkEventScroll; @@ -149,12 +148,6 @@ class WebKeyboardEvent : public WebInputEvent { // to stuff everything into key_code, or make this field shared by all // implementations, but this will have to do for now. wchar_t text; - - // Stores the GDK keyval and modifier state of the GdkEventKey; this is used - // to transport these values across IPC so they can be used in the front end - // code. - guint gdk_keyval; - guint gdk_modifier; #endif WebKeyboardEvent() diff --git a/webkit/glue/webinputevent_linux.cc b/webkit/glue/webinputevent_linux.cc index 5c7efd5..328dafe 100644 --- a/webkit/glue/webinputevent_linux.cc +++ b/webkit/glue/webinputevent_linux.cc @@ -148,9 +148,7 @@ WebMouseWheelEvent::WebMouseWheelEvent(const GdkEventScroll* event) { } } -WebKeyboardEvent::WebKeyboardEvent(const GdkEventKey* event) - : gdk_keyval(event->keyval), - gdk_modifier(event->state) { +WebKeyboardEvent::WebKeyboardEvent(const GdkEventKey* event) { modifiers = GdkStateToWebEventModifiers(event->state); // GDK only exposes key press and release events. By contrast, |