summaryrefslogtreecommitdiffstats
path: root/base/message_pump_glib_x.h
diff options
context:
space:
mode:
authorevan@chromium.org <evan@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98>2010-11-12 01:49:15 +0000
committerevan@chromium.org <evan@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98>2010-11-12 01:49:15 +0000
commit34150bd49c099265dac814b1d30e5f7b4c500fec (patch)
treee350e86a3130dadd2226e8265fdacd73aeb5e446 /base/message_pump_glib_x.h
parentf4f7dd072cb18b122edeca7992b1984759757962 (diff)
downloadchromium_src-34150bd49c099265dac814b1d30e5f7b4c500fec.zip
chromium_src-34150bd49c099265dac814b1d30e5f7b4c500fec.tar.gz
chromium_src-34150bd49c099265dac814b1d30e5f7b4c500fec.tar.bz2
Revert "touchui: First pass at XInput2 message pump."
This reverts commit r65888, build breakage. git-svn-id: svn://svn.chromium.org/chrome/trunk/src@65890 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'base/message_pump_glib_x.h')
-rw-r--r--base/message_pump_glib_x.h22
1 files changed, 0 insertions, 22 deletions
diff --git a/base/message_pump_glib_x.h b/base/message_pump_glib_x.h
index c6d98e3..2f50731 100644
--- a/base/message_pump_glib_x.h
+++ b/base/message_pump_glib_x.h
@@ -9,7 +9,6 @@
#include "base/message_pump_glib.h"
#include <bitset>
-#include <set>
#include <glib.h>
#include <gtk/gtk.h>
@@ -29,11 +28,6 @@ class MessagePumpGlibX : public MessagePumpForUI {
// was captured and being processed by GDK (when |false|).
bool IsDispatchingEvent(void) { return dispatching_event_; }
-#if defined(HAVE_XINPUT2)
- // Setup an X Window for XInput2 events.
- void SetupXInput2ForXWindow(Window xid);
-#endif
-
private:
static void EventDispatcherX(GdkEvent* event, gpointer data);
@@ -41,22 +35,6 @@ class MessagePumpGlibX : public MessagePumpForUI {
// processed so that GDK doesn't get to them.
void InitializeEventsToCapture(void);
-#if defined(HAVE_XINPUT2)
- // Initialize X2 input.
- void InitializeXInput2(void);
-
- // The opcode used for checking events.
- int xiopcode_;
-
- // The list of master pointer devices. We maintain this list so that it is not
- // necessary to query X for the list of devices for each GdkWindow created.
- std::set<int> masters_;
-
- // The list of slave (physical) pointer devices.
- // TODO(sad): This is currently unused, and may be removed eventually.
- std::set<int> slaves_;
-#endif
-
// The event source for GDK events.
GSource* gdksource_;