| 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 31232b1270072315d88a17c578b475c39e6e2ed7..34e1603b1915d13b1ca7331af270554742476808 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);
|
|
|
| @@ -74,6 +74,8 @@ class AURA_EXPORT WindowTreeHostX11 : public WindowTreeHost,
|
| ui::X11AtomCache* atom_cache() { return &atom_cache_; }
|
|
|
| private:
|
| + bool IsTouchEventTargetingThisRootWindow(XEvent* xev);
|
| +
|
| // Dispatches XI2 events. Note that some events targetted for the X root
|
| // window are dispatched to the aura root window (e.g. touch events after
|
| // calibration).
|
|
|