ash: Fix touch-event handling for modal windows.

ash/wm/window_modality_controller.cc

 // Copyright (c) 2012 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.
 
 #include "ash/wm/window_modality_controller.h"
 
 #include <algorithm>
 
 #include "ash/wm/window_util.h"
 #include "ui/aura/client/aura_constants.h"
@@ skipping 63 matching lines @@
 ////////////////////////////////////////////////////////////////////////////////
 // WindowModalityController, aura::EventFilter implementation:
 
 bool WindowModalityController::PreHandleKeyEvent(aura::Window* target,
                                                  aura::KeyEvent* event) {
   return !!wm::GetWindowModalTransient(target);
 }
 
 bool WindowModalityController::PreHandleMouseEvent(aura::Window* target,
                                                    aura::MouseEvent* event) {
-  aura::Window* modal_transient_child = wm::GetWindowModalTransient(target);
-  if (modal_transient_child && event->type() == ui::ET_MOUSE_PRESSED)
-    wm::ActivateWindow(modal_transient_child);
-  return !!modal_transient_child;
+  return ProcessLocatedEvent(target, event);
 }
 
 ui::TouchStatus WindowModalityController::PreHandleTouchEvent(
     aura::Window* target,
     aura::TouchEvent* event) {
-  // TODO: make touch work with modals.
-  return ui::TOUCH_STATUS_UNKNOWN;
+  return ProcessLocatedEvent(target, event) ? ui::TOUCH_STATUS_CONTINUE :
+                                              ui::TOUCH_STATUS_UNKNOWN;
 }
 
 ui::GestureStatus WindowModalityController::PreHandleGestureEvent(
     aura::Window* target,
     aura::GestureEvent* event) {
   // TODO: make gestures work with modals.
   return ui::GESTURE_STATUS_UNKNOWN;
 }
 
 void WindowModalityController::OnWindowInitialized(aura::Window* window) {
@@ skipping 12 matching lines @@
     if (capture_window)
       capture_window->ReleaseCapture();
   }
 }
 
 void WindowModalityController::OnWindowDestroyed(aura::Window* window) {
   windows_.erase(std::find(windows_.begin(), windows_.end(), window));
   window->RemoveObserver(this);
 }
 
+bool WindowModalityController::ProcessLocatedEvent(aura::Window* target,
+                                                   aura::LocatedEvent* event) {
+  aura::Window* modal_transient_child = wm::GetWindowModalTransient(target);
+  if (modal_transient_child && (event->type() == ui::ET_MOUSE_PRESSED ||
+                                event->type() == ui::ET_TOUCH_PRESSED)) {
+    wm::ActivateWindow(modal_transient_child);
+  }
+  return !!modal_transient_child;
+}
+
 }  // namespace internal
 }  // namespace ash