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

ui/aura/window_tree_host_x11.h

Index: ui/aura/window_tree_host_x11.h
===================================================================
--- ui/aura/window_tree_host_x11.h	(revision 271938)
+++ ui/aura/window_tree_host_x11.h	(working copy)
@@ -64,7 +64,7 @@
   // 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 @@
   // The bounds of |xwindow_|.
   gfx::Rect bounds_;
 
+  scoped_ptr<internal::TouchEventCalibrate> touch_calibrate_;
+
   ui::X11AtomCache atom_cache_;
 
   DISALLOW_COPY_AND_ASSIGN(WindowTreeHostX11);