aura: Make sure the root-window retains the X events it was already listening for.

ui/aura/root_window_host_linux.h

Index: ui/aura/root_window_host_linux.h
diff --git a/ui/aura/root_window_host_linux.h b/ui/aura/root_window_host_linux.h
index c8436c2714da9614de4a941055c288f8bc1c0bee..a8862568f97acbea5da60226bcc2bfa3770fef95 100644
--- a/ui/aura/root_window_host_linux.h
+++ b/ui/aura/root_window_host_linux.h
@@ -37,6 +37,13 @@ class RootWindowHostLinux : public RootWindowHost,
   virtual bool Dispatch(const base::NativeEvent& event) OVERRIDE;
 
  private:
+  bool DispatchEventForRootWindow(const base::NativeEvent& event);
+
+  // Dispatches events of type GenericEvent. Note that some events targetted for
+  // the X root window are dispatched to the aura root window (e.g. touch events
+  // after calibration).
+  void DispatchGenericEvent(const base::NativeEvent& event);
+
   // RootWindowHost Overrides.
   virtual RootWindow* GetRootWindow() OVERRIDE;
   virtual gfx::AcceleratedWidget GetAcceleratedWidget() OVERRIDE;