Re-land "Issue 191223007: Move touch CTM from X into Chrome"

ui/aura/window_tree_host_x11.h

Index: ui/aura/window_tree_host_x11.h
diff --git a/ui/aura/window_tree_host_x11.h b/ui/aura/window_tree_host_x11.h
index f09b28d285965b4d87c5c46418ef9baff2a4b729..1db9f675684d320b2f64aad9f6d42e7b4ea85fc7 100644
--- a/ui/aura/window_tree_host_x11.h
+++ b/ui/aura/window_tree_host_x11.h
@@ -64,7 +64,7 @@ class AURA_EXPORT WindowTreeHostX11 : public WindowTreeHost,
   // Called when X Configure Notify event is recevied.
   virtual void OnConfigureNotify();
 
-  // Translates the native mouse location into screen coordinates and and
+  // Translates the native mouse location into screen coordinates and
   // dispatches the event via WindowEventDispatcher.
   virtual void TranslateAndDispatchLocatedEvent(ui::LocatedEvent* event);
 
@@ -99,6 +99,8 @@ class AURA_EXPORT WindowTreeHostX11 : public WindowTreeHost,
   // The bounds of |xwindow_|.
   gfx::Rect bounds_;
 
+  scoped_ptr<internal::TouchEventCalibrate> touch_calibrate_;
+
   ui::X11AtomCache atom_cache_;
 
   DISALLOW_COPY_AND_ASSIGN(WindowTreeHostX11);