Tweak XInput2 event subscription

base/message_pump_glib_x.h

 // Copyright (c) 2011 The Chromium Authors. All rights reserved.
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
 #ifndef BASE_MESSAGE_PUMP_GLIB_X_H
 #define BASE_MESSAGE_PUMP_GLIB_X_H
 
 #include "base/message_pump.h"
 #include "base/message_pump_glib.h"
 
@@ skipping 30 matching lines @@
   // 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 floating pointer devices.
-  std::set<int> floats_;
+  // The list of pointer devices we care about.  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> pointer_devices_;
 #endif
 
   // The event source for GDK events.
   GSource* gdksource_;
 
   // The default GDK event dispatcher. This is stored so that it can be restored
   // when necessary during nested event dispatching.
   gboolean (*gdkdispatcher_)(GSource*, GSourceFunc, void*);
 
   // Indicates whether a GDK event was injected by chrome (when |true|) or if it
@@ skipping 12 matching lines @@
   // it should be passed on to the default GDK handler.
   std::bitset<LASTEvent> capture_x_events_;
   std::bitset<GDK_EVENT_LAST> capture_gdk_events_;
 
   DISALLOW_COPY_AND_ASSIGN(MessagePumpGlibX);
 };
 
 }  // namespace base
 
 #endif  // BASE_MESSAGE_PUMP_GLIB_X_H