Merge 270252 "Re-land "Move touch CTM from X into Chrome""

ash/display/display_info.h

Index: ash/display/display_info.h
===================================================================
--- ash/display/display_info.h	(revision 271938)
+++ ash/display/display_info.h	(working copy)
@@ -103,6 +103,9 @@
   }
   gfx::Display::TouchSupport touch_support() const { return touch_support_; }
 
+  void set_touch_device_id(int id) { touch_device_id_ = id; }
+  int touch_device_id() const { return touch_device_id_; }
+
   // Gets/Sets the device scale factor of the display.
   float device_scale_factor() const { return device_scale_factor_; }
   void set_device_scale_factor(float scale) { device_scale_factor_ = scale; }
@@ -201,6 +204,10 @@
   gfx::Display::Rotation rotation_;
   gfx::Display::TouchSupport touch_support_;
 
+  // If the display is also a touch device, it will have a positive
+  // |touch_device_id_|. Otherwise |touch_device_id_| is 0.
+  int touch_device_id_;
+
   // This specifies the device's pixel density. (For example, a
   // display whose DPI is higher than the threshold is considered to have
   // device_scale_factor = 2.0 on Chrome OS).  This is used by the