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

ui/aura/window_tree_host_x11.h

 // Copyright (c) 2012 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_AURA_WINDOW_TREE_HOST_X11_H_
 #define UI_AURA_WINDOW_TREE_HOST_X11_H_
 
 #include "base/memory/scoped_ptr.h"
 #include "ui/aura/aura_export.h"
 #include "ui/aura/window_tree_host.h"
@@ skipping 46 matching lines @@
   virtual void MoveCursorToNative(const gfx::Point& location) OVERRIDE;
   virtual void OnCursorVisibilityChangedNative(bool show) OVERRIDE;
 
   // ui::EventSource overrides.
   virtual ui::EventProcessor* GetEventProcessor() OVERRIDE;
 
  protected:
   // 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);
 
   ::Window x_root_window() { return x_root_window_; }
   XDisplay* xdisplay() { return xdisplay_; }
   const gfx::Rect bounds() const { return bounds_; }
   ui::X11AtomCache* atom_cache() { return &atom_cache_; }
 
  private:
   // Dispatches XI2 events. Note that some events targetted for the X root
@@ skipping 14 matching lines @@
 
   // Current Aura cursor.
   gfx::NativeCursor current_cursor_;
 
   // Is the window mapped to the screen?
   bool window_mapped_;
 
   // The bounds of |xwindow_|.
   gfx::Rect bounds_;
 
+  scoped_ptr<internal::TouchEventCalibrate> touch_calibrate_;
+
   ui::X11AtomCache atom_cache_;
 
   DISALLOW_COPY_AND_ASSIGN(WindowTreeHostX11);
 };
 
 namespace test {
 
 // Set the default value of the override redirect flag used to
 // create a X window for WindowTreeHostX11.
 AURA_EXPORT void SetUseOverrideRedirectWindowByDefault(bool override_redirect);
 
 }  // namespace test
 }  // namespace aura
 
 #endif  // UI_AURA_WINDOW_TREE_HOST_X11_H_