ui: Remove TouchStatus in favour of EventResult.

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 66 matching lines @@
 bool WindowModalityController::PreHandleKeyEvent(aura::Window* target,
                                                  ui::KeyEvent* event) {
   return !!wm::GetWindowModalTransient(target);
 }
 
 bool WindowModalityController::PreHandleMouseEvent(aura::Window* target,
                                                    ui::MouseEvent* event) {
   return ProcessLocatedEvent(target, event);
 }
 
-ui::TouchStatus WindowModalityController::PreHandleTouchEvent(
+ui::EventResult WindowModalityController::PreHandleTouchEvent(
     aura::Window* target,
     ui::TouchEvent* event) {
-  return ProcessLocatedEvent(target, event) ? ui::TOUCH_STATUS_CONTINUE :
-                                              ui::TOUCH_STATUS_UNKNOWN;
+  return ProcessLocatedEvent(target, event) ? ui::ER_CONSUMED :
+                                              ui::ER_UNHANDLED;
 }
 
 ui::EventResult WindowModalityController::PreHandleGestureEvent(
     aura::Window* target,
     ui::GestureEvent* event) {
   // TODO: make gestures work with modals.
   return ui::ER_UNHANDLED;
 }
 
 void WindowModalityController::OnWindowInitialized(aura::Window* window) {
@@ skipping 24 matching lines @@
   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