Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(2133)

Unified Diff: base/message_pump_glib_x.h

Issue 4894001: Revert 65938 (arm compile fail) - touchui: First pass at XInput2 message pump... (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src/
Patch Set: Created 10 years, 1 month ago
Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.
Jump to:
View side-by-side diff with in-line comments
Download patch
« no previous file with comments | « no previous file | base/message_pump_glib_x.cc » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: base/message_pump_glib_x.h
===================================================================
--- base/message_pump_glib_x.h (revision 65939)
+++ base/message_pump_glib_x.h (working copy)
@@ -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 @@
// 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 @@
// 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_;
« no previous file with comments | « no previous file | base/message_pump_glib_x.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698