Index: chrome/browser/chromeos/xinput_hierarchy_changed_event_listener.h |
diff --git a/chrome/browser/chromeos/xinput_hierarchy_changed_event_listener.h b/chrome/browser/chromeos/xinput_hierarchy_changed_event_listener.h |
index a269bbc5374215011ca1ccaeba15515ece9d7006..dde0fabd8d7d8d6a01732673bf157fce9b9f81a6 100644 |
--- a/chrome/browser/chromeos/xinput_hierarchy_changed_event_listener.h |
+++ b/chrome/browser/chromeos/xinput_hierarchy_changed_event_listener.h |
@@ -35,15 +35,13 @@ class XInputHierarchyChangedEventListener : public MessageLoopForUI::Observer { |
XInputHierarchyChangedEventListener(); |
virtual ~XInputHierarchyChangedEventListener(); |
-#if defined(TOUCH_UI) || !defined(TOOLKIT_USES_GTK) |
- // MessageLoopForUI::Observer overrides. |
- virtual base::EventStatus WillProcessEvent( |
- const base::NativeEvent& event) OVERRIDE; |
- virtual void DidProcessEvent(const base::NativeEvent& event) OVERRIDE; |
-#else |
- // When TOUCH_UI is not defined, WillProcessXEvent() will not be called |
- // automatically. We have to call the function manually by adding the Gdk |
- // event filter. |
+ void Init(); |
+ void StopImpl(); |
+ |
+#if defined(TOOLKIT_USES_GTK) |
+ // When GTK events are processed, WillProcessXEvent() is not called |
+ // automatically. It is necessary to call the function manually by adding the |
+ // Gdk event filter. |
static GdkFilterReturn GdkEventFilter(GdkXEvent* gxevent, |
GdkEvent* gevent, |
gpointer data); |
@@ -51,6 +49,11 @@ class XInputHierarchyChangedEventListener : public MessageLoopForUI::Observer { |
// MessageLoopForUI::Observer overrides. |
virtual void WillProcessEvent(GdkEvent* event) OVERRIDE {} |
virtual void DidProcessEvent(GdkEvent* event) OVERRIDE {} |
+#else |
+ // MessageLoopForUI::Observer overrides. |
+ virtual base::EventStatus WillProcessEvent( |
+ const base::NativeEvent& event) OVERRIDE; |
+ virtual void DidProcessEvent(const base::NativeEvent& event) OVERRIDE; |
#endif |
// Returns true if the event was processed, false otherwise. |