[Ozone-Evdev] Propagate touchscreen device information to DeviceDataManager

ui/events/ozone/evdev/event_device_info.h

 // Copyright 2013 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_OZONE_EVDEV_EVENT_DEVICE_INFO_H_
 #define UI_EVENTS_OZONE_EVDEV_EVENT_DEVICE_INFO_H_
 
 #include <limits.h>
 #include <linux/input.h>
 
 #include "base/basictypes.h"
 #include "ui/events/ozone/evdev/events_ozone_evdev_export.h"
 
 #define EVDEV_LONG_BITS (CHAR_BIT * sizeof(long))
 #define EVDEV_BITS_TO_LONGS(x) (((x) + EVDEV_LONG_BITS - 1) / EVDEV_LONG_BITS)
 
 namespace ui {
 
 // Device information for Linux input devices
 //
 // This stores and queries information about input devices; in
 // particular it knows which events the device can generate.
 class EVENTS_OZONE_EVDEV_EXPORT EventDeviceInfo {
  public:
-  EventDeviceInfo();
+  EventDeviceInfo(int id);
   ~EventDeviceInfo();
 
+  int id() const { return id_; }

[spang, 2014/09/29 23:54:35]

This doesn't belong here - it isn't related to the event device.

Why can't it just live on EventConverterEvdev?

[dnicoara, 2014/09/30 18:23:27]

Done.

+
   // Initialize device information from an open device.
   bool Initialize(int fd);
 
   // Check events this device can generate.
   bool HasEventType(unsigned int type) const;
   bool HasKeyEvent(unsigned int code) const;
   bool HasRelEvent(unsigned int code) const;
   bool HasAbsEvent(unsigned int code) const;
   bool HasMscEvent(unsigned int code) const;
   bool HasSwEvent(unsigned int code) const;
@@ skipping 10 matching lines @@
   bool HasAbsXY() const;
 
   // Has relativeX & Y axes.
   bool HasRelXY() const;
 
   // Determine whether absolute device X/Y coordinates are mapped onto the
   // screen. This is the case for touchscreens and tablets but not touchpads.
   bool IsMappedToScreen() const;
 
  private:
+  int id_;
   unsigned long ev_bits_[EVDEV_BITS_TO_LONGS(EV_CNT)];
   unsigned long key_bits_[EVDEV_BITS_TO_LONGS(KEY_CNT)];
   unsigned long rel_bits_[EVDEV_BITS_TO_LONGS(REL_CNT)];
   unsigned long abs_bits_[EVDEV_BITS_TO_LONGS(ABS_CNT)];
   unsigned long msc_bits_[EVDEV_BITS_TO_LONGS(MSC_CNT)];
   unsigned long sw_bits_[EVDEV_BITS_TO_LONGS(SW_CNT)];
   unsigned long led_bits_[EVDEV_BITS_TO_LONGS(LED_CNT)];
   unsigned long prop_bits_[EVDEV_BITS_TO_LONGS(INPUT_PROP_CNT)];
 
   struct input_absinfo abs_info_[ABS_CNT];
 
   DISALLOW_COPY_AND_ASSIGN(EventDeviceInfo);
 };
 
 }  // namspace ui
 
 #endif  // UI_EVENTS_OZONE_EVDEV_EVENT_DEVICE_INFO_H_