ui: Remove TouchStatus in favour of EventResult.

ash/drag_drop/drag_drop_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/drag_drop/drag_drop_controller.h"
 
 #include "ash/drag_drop/drag_drop_tracker.h"
 #include "ash/drag_drop/drag_image_view.h"
 #include "ash/shell.h"
 #include "ash/wm/coordinate_conversion.h"
@@ skipping 211 matching lines @@
       break;
     default:
       // We could also reach here because RootWindow may sometimes generate a
       // bunch of fake mouse events
       // (aura::RootWindow::PostMouseMoveEventAfterWindowChange).
       break;
   }
   return true;
 }
 
-ui::TouchStatus DragDropController::PreHandleTouchEvent(
+ui::EventResult DragDropController::PreHandleTouchEvent(
     aura::Window* target,
     ui::TouchEvent* event) {
   // TODO(sad): Also check for the touch-id.
   // TODO(varunjain): Add code for supporting drag-and-drop across displays
   // (http://crbug.com/114755).
   if (!IsDragDropInProgress())
-    return ui::TOUCH_STATUS_UNKNOWN;
+    return ui::ER_UNHANDLED;
   switch (event->type()) {
     case ui::ET_TOUCH_MOVED:
       DragUpdate(target, *event);
       break;
     case ui::ET_TOUCH_RELEASED:
       Drop(target, *event);
       break;
     case ui::ET_TOUCH_CANCELLED:
       DragCancel();
       break;
     default:
-      return ui::TOUCH_STATUS_UNKNOWN;
+      return ui::ER_UNHANDLED;
   }
-  return ui::TOUCH_STATUS_CONTINUE;
+  return ui::ER_CONSUMED;
 }
 
 ui::EventResult DragDropController::PreHandleGestureEvent(
     aura::Window* target,
     ui::GestureEvent* event) {
   return ui::ER_UNHANDLED;
 }
 
 void DragDropController::OnWindowDestroyed(aura::Window* window) {
   if (drag_window_ == window) {
@@ skipping 34 matching lines @@
     drag_window_->RemoveObserver(this);
   drag_window_ = NULL;
   drag_data_ = NULL;
   // Cleanup can be called again while deleting DragDropTracker, so use Pass
   // instead of reset to avoid double free.
   drag_drop_tracker_.Pass();
 }
 
 }  // namespace internal
 }  // namespace ash