diff options
Diffstat (limited to 'chromium/ash/wm/window_selector.cc')
| -rw-r--r-- | chromium/ash/wm/window_selector.cc | 8 |
1 files changed, 2 insertions, 6 deletions
diff --git a/chromium/ash/wm/window_selector.cc b/chromium/ash/wm/window_selector.cc index 47e20159572..8e87a95163c 100644 --- a/chromium/ash/wm/window_selector.cc +++ b/chromium/ash/wm/window_selector.cc @@ -361,10 +361,6 @@ void WindowSelector::OnEvent(ui::Event* event) { aura::Window* target = static_cast<aura::Window*>(event->target()); for (size_t i = 0; i < windows_.size(); ++i) { if (windows_[i]->Contains(target)) { - // TODO(flackr): StopPropogation prevents generation of gesture events. - // We should find a better way to prevent events from being delivered to - // the window, perhaps a transparent window in front of the target window - // or using EventClientImpl::CanProcessEventsWithinSubtree. event->StopPropagation(); break; } @@ -385,8 +381,8 @@ void WindowSelector::OnMouseEvent(ui::MouseEvent* event) { HandleSelectionEvent(target); } -void WindowSelector::OnTouchEvent(ui::TouchEvent* event) { - if (event->type() != ui::ET_TOUCH_PRESSED) +void WindowSelector::OnGestureEvent(ui::GestureEvent* event) { + if (event->type() != ui::ET_GESTURE_TAP) return; WindowSelectorWindow* target = GetEventTarget(event); if (!target) |