Move touch CTM from X into Chrome

ash/display/display_info.h

Index: ash/display/display_info.h
diff --git a/ash/display/display_info.h b/ash/display/display_info.h
index ccb989a15cf5f8685e806fe792c3984a3af0bcac..c2f8ae463bbcf3e12be147618c8893e255861859 100644
--- a/ash/display/display_info.h
+++ b/ash/display/display_info.h
@@ -98,6 +98,9 @@ class ASH_EXPORT DisplayInfo {
   }
   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; }
@@ -169,6 +172,8 @@ class ASH_EXPORT DisplayInfo {
   gfx::Display::Rotation rotation_;
   gfx::Display::TouchSupport touch_support_;
 
+  int touch_device_id_;

[oshima, 2014/03/14 21:53:53]

This needs documentation.

[Yufeng Shen (Slow to review), 2014/04/29 20:34:18]

Done.

+
   // 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