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

ash/host/ash_window_tree_host_x11.h

 // Copyright 2014 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 ASH_HOST_ASH_WINDOW_TREE_HOST_X11_H_
 #define ASH_HOST_ASH_WINDOW_TREE_HOST_X11_H_
 
 #include "ash/ash_export.h"
 #include "ash/host/ash_window_tree_host.h"
 #include "ash/host/transformer_helper.h"
@@ skipping 14 matching lines @@
 
  private:
   // AshWindowTreeHost:
   virtual void ToggleFullScreen() OVERRIDE;
   virtual bool ConfineCursorToRootWindow() OVERRIDE;
   virtual void UnConfineCursor() OVERRIDE;
   virtual void SetRootWindowTransformer(
       scoped_ptr<RootWindowTransformer> transformer) OVERRIDE;
   virtual gfx::Insets GetHostInsets() const OVERRIDE;
   virtual aura::WindowTreeHost* AsWindowTreeHost() OVERRIDE;
+  virtual void UpdateDisplayID(int64 id1, int64 id2) OVERRIDE;
 
   // aura::WindowTreehost:
   virtual void SetBounds(const gfx::Rect& bounds) OVERRIDE;
   virtual gfx::Transform GetRootTransform() const OVERRIDE;
   virtual void SetRootTransform(const gfx::Transform& transform) OVERRIDE;
   virtual gfx::Transform GetInverseRootTransform() const OVERRIDE;
   virtual void UpdateRootWindowSize(const gfx::Size& host_size) OVERRIDE;
   virtual void OnCursorVisibilityChangedNative(bool show) OVERRIDE;
 
   // aura::WindowTreeHostX11:
   virtual void OnConfigureNotify() OVERRIDE;
+  virtual bool CanDispatchEvent(const ui::PlatformEvent& event) OVERRIDE;
   virtual void TranslateAndDispatchLocatedEvent(ui::LocatedEvent* event)
       OVERRIDE;
 
   // EnvObserver overrides.
   virtual void OnWindowInitialized(aura::Window* window) OVERRIDE;
   virtual void OnHostInitialized(aura::WindowTreeHost* host) OVERRIDE;
 
-  class TouchEventCalibrate;
-
-  // Update is_internal_display_ based on the current state.
-  void UpdateIsInternalDisplay();
-
   // Set the CrOS touchpad "tap paused" property. It is used to temporarily
   // turn off the Tap-to-click feature when the mouse pointer is invisible.
   void SetCrOSTapPaused(bool state);
 
-  // True if the root host resides on the internal display
-  bool is_internal_display_;
-
   scoped_ptr<XID[]> pointer_barriers_;
 
-  scoped_ptr<TouchEventCalibrate> touch_calibrate_;
+  TransformerHelper transformer_helper_;
 
-  TransformerHelper transformer_helper_;
+  // The display IDs associated with this root window.
+  // In single monitor or extended mode dual monitor case, the root window
+  // is associated with one display.
+  // In mirror mode dual monitors case, the root window is associated with
+  // both displays.
+  std::pair<int64, int64> display_ids_;
 
   DISALLOW_COPY_AND_ASSIGN(AshWindowTreeHostX11);
 };
 
 }  // namespace ash
 
 #endif  // ASH_HOST_ASH_WINDOW_TREE_HOST_X11_H_