Index: chrome/browser/chromeos/system_key_event_listener.h |
diff --git a/chrome/browser/chromeos/system_key_event_listener.h b/chrome/browser/chromeos/system_key_event_listener.h |
index 7ba32d5530404ae0da68d243df5b5b970cf510b2..51e668de50f64066238f2eef5c4bfd1cc44e7ba9 100644 |
--- a/chrome/browser/chromeos/system_key_event_listener.h |
+++ b/chrome/browser/chromeos/system_key_event_listener.h |
@@ -44,6 +44,10 @@ class SystemKeyEventListener : public WmMessageListener::Observer, |
SystemKeyEventListener(); |
virtual ~SystemKeyEventListener(); |
+#if defined(TOUCH_UI) |
+ // MessageLoopForUI::Observer overrides. |
+ virtual EventStatus WillProcessXEvent(XEvent* xevent) OVERRIDE; |
+#else |
// This event filter intercepts events before they reach GDK, allowing us to |
// check for system level keyboard events regardless of which window has |
// focus. |
@@ -51,6 +55,11 @@ class SystemKeyEventListener : public WmMessageListener::Observer, |
GdkEvent* gevent, |
gpointer data); |
+ // MessageLoopForUI::Observer overrides. |
+ virtual void WillProcessEvent(GdkEvent* event) OVERRIDE {} |
+ virtual void DidProcessEvent(GdkEvent* event) OVERRIDE {} |
+#endif |
+ |
// Tell X we are interested in the specified key/mask combination. |
// Capslock and Numlock are always ignored. |
void GrabKey(int32 key, uint32 mask); |
@@ -59,14 +68,8 @@ class SystemKeyEventListener : public WmMessageListener::Observer, |
void OnVolumeDown(); |
void OnVolumeUp(); |
- // MessageLoopForUI::Observer overrides. |
- virtual void WillProcessEvent(GdkEvent* event) OVERRIDE {} |
- virtual void DidProcessEvent(GdkEvent* event) OVERRIDE {} |
- virtual bool WillProcessXEvent(XEvent* xevent) |
-#if defined(TOUCH_UI) |
- OVERRIDE |
-#endif |
- ; |
+ // Returns true if the event was processed, false otherwise. |
+ virtual bool ProcessedXEvent(XEvent* xevent); |
int32 key_volume_mute_; |
int32 key_volume_down_; |