| Index: ash/host/ash_window_tree_host_x11.cc
|
| diff --git a/ash/host/ash_window_tree_host_x11.cc b/ash/host/ash_window_tree_host_x11.cc
|
| index e49e9617727490faa3b400f4998022d46c448f86..8273b5ed90ca3fff950c95d5617aadc53961e9b8 100644
|
| --- a/ash/host/ash_window_tree_host_x11.cc
|
| +++ b/ash/host/ash_window_tree_host_x11.cc
|
| @@ -282,7 +282,9 @@ void AshWindowTreeHostX11::UpdateRootWindowSize(const gfx::Size& host_size) {
|
| }
|
|
|
| void AshWindowTreeHostX11::OnCursorVisibilityChangedNative(bool show) {
|
| +#if defined(OS_CHROMEOS)
|
| SetCrOSTapPaused(!show);
|
| +#endif
|
| }
|
|
|
| void AshWindowTreeHostX11::OnWindowInitialized(aura::Window* window) {}
|
| @@ -296,9 +298,11 @@ void AshWindowTreeHostX11::OnHostInitialized(aura::WindowTreeHost* host) {
|
| return;
|
| UpdateIsInternalDisplay();
|
|
|
| +#if defined(OS_CHROMEOS)
|
| // We have to enable Tap-to-click by default because the cursor is set to
|
| // visible in Shell::InitRootWindowController.
|
| SetCrOSTapPaused(false);
|
| +#endif
|
| }
|
|
|
| void AshWindowTreeHostX11::OnConfigureNotify() {
|
| @@ -319,6 +323,7 @@ void AshWindowTreeHostX11::TranslateAndDispatchLocatedEvent(
|
| case ui::ET_TOUCH_PRESSED:
|
| case ui::ET_TOUCH_CANCELLED:
|
| case ui::ET_TOUCH_RELEASED: {
|
| +#if defined(OS_CHROMEOS)
|
| ui::TouchEvent* touchev = static_cast<ui::TouchEvent*>(event);
|
| if (base::SysInfo::IsRunningOnChromeOS()) {
|
| // X maps the touch-surface to the size of the X root-window.
|
| @@ -333,6 +338,7 @@ void AshWindowTreeHostX11::TranslateAndDispatchLocatedEvent(
|
| touch_calibrate_->Calibrate(touchev, bounds());
|
| #endif // defined(USE_XI2_MT)
|
| }
|
| +#endif // defined(OS_CHROMEOS)
|
| break;
|
| }
|
| default: {
|
| @@ -368,6 +374,7 @@ void AshWindowTreeHostX11::UpdateIsInternalDisplay() {
|
| is_internal_display_ = display.IsInternal();
|
| }
|
|
|
| +#if defined(OS_CHROMEOS)
|
| void AshWindowTreeHostX11::SetCrOSTapPaused(bool state) {
|
| if (!ui::IsXInput2Available())
|
| return;
|
| @@ -410,6 +417,7 @@ void AshWindowTreeHostX11::SetCrOSTapPaused(bool state) {
|
| }
|
| }
|
| }
|
| +#endif
|
|
|
| AshWindowTreeHost* AshWindowTreeHost::Create(const gfx::Rect& initial_bounds) {
|
| return new AshWindowTreeHostX11(initial_bounds);
|
|
|