Change device IDs from unsigned to signed.

ui/events/devices/x11/touch_factory_x11.h

 // Copyright (c) 2012 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 UI_EVENTS_DEVICES_X11_TOUCH_FACTORY_X11_H_
 #define UI_EVENTS_DEVICES_X11_TOUCH_FACTORY_X11_H_
 
 #include <bitset>
 #include <map>
 #include <set>
@@ skipping 31 matching lines @@
   // Checks whether an XI2 event should be processed or not (i.e. if the event
   // originated from a device we are interested in).
   bool ShouldProcessXI2Event(XEvent* xevent);
 
   // Setup an X Window for XInput2 events.
   void SetupXI2ForXWindow(::Window xid);
 
   // Keeps a list of touch devices so that it is possible to determine if a
   // pointer event is a touch-event or a mouse-event. The list is reset each
   // time this is called.
-  void SetTouchDeviceList(const std::vector<unsigned int>& devices);
+  void SetTouchDeviceList(const std::vector<int>& devices);
+
+  // Is the device ID valid?
+  bool IsValidDevice(int deviceid) const;
 
   // Is the device a touch-device?
-  bool IsTouchDevice(unsigned int deviceid) const;
+  bool IsTouchDevice(int deviceid) const;
 
   // Is the device a real multi-touch-device? (see doc. for |touch_device_list_|
   // below for more explanation.)
-  bool IsMultiTouchDevice(unsigned int deviceid) const;
+  bool IsMultiTouchDevice(int deviceid) const;
 
   // Tries to find an existing slot ID mapping to tracking ID. Returns true
   // if the slot is found and it is saved in |slot|, false if no such slot
   // can be found.
   bool QuerySlotForTrackingID(uint32 tracking_id, int* slot);
 
   // Tries to find an existing slot ID mapping to tracking ID. If there
   // isn't one already, allocates a new slot ID and sets up the mapping.
   int GetSlotForTrackingID(uint32 tracking_id);
 
   // Releases the slot ID mapping to tracking ID.
   void ReleaseSlotForTrackingID(uint32 tracking_id);
 
   // Whether any touch device is currently present and enabled.
   bool IsTouchDevicePresent();
 
   // Pairs of <vendor id, product id> of external touch screens.
   const std::set<std::pair<int, int> >& GetTouchscreenIds() const {
     return touchscreen_ids_;
   }
 
   // Resets the TouchFactory singleton.
   void ResetForTest();
 
   // Sets up the device id in the list |devices| as multi-touch capable
   // devices and enables touch events processing. This function is only
   // for test purpose, and it does not query from X server.
-  void SetTouchDeviceForTest(const std::vector<unsigned int>& devices);
+  void SetTouchDeviceForTest(const std::vector<int>& devices);
 
   // Sets up the device id in the list |devices| as pointer devices.
   // This function is only for test purpose, and it does not query from
   // X server.
-  void SetPointerDeviceForTest(const std::vector<unsigned int>& devices);
+  void SetPointerDeviceForTest(const std::vector<int>& devices);
 
  private:
   // Requirement for Singleton
   friend struct DefaultSingletonTraits<TouchFactory>;
 
   void CacheTouchscreenIds(Display* display, int id);
 
   // NOTE: To keep track of touch devices, we currently maintain a lookup table
   // to quickly decide if a device is a touch device or not. We also maintain a
   // list of the touch devices. Ideally, there will be only one touch device,
@@ skipping 27 matching lines @@
   int virtual_core_keyboard_device_;
 
   SequentialIDGenerator id_generator_;
 
   DISALLOW_COPY_AND_ASSIGN(TouchFactory);
 };
 
 }  // namespace ui
 
 #endif  // UI_EVENTS_DEVICES_X11_TOUCH_FACTORY_X11_H_