events: Change gesture-event handler in EventHandler to not return any values.

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 314 matching lines @@
   switch (event->type()) {
     case ui::ET_TOUCH_CANCELLED:
       DragCancel();
       break;
     default:
       break;
   }
   return ui::ER_UNHANDLED;
 }
 
-ui::EventResult DragDropController::OnGestureEvent(ui::GestureEvent* event) {
+void DragDropController::OnGestureEvent(ui::GestureEvent* event) {
   if (!IsDragDropInProgress())
-    return ui::ER_UNHANDLED;
+    return;
 
   // If current drag session was not started by touch, dont process this touch
   // event, but consume it so it does not interfere with current drag session.
-  if (current_drag_event_source_ != ui::DragDropTypes::DRAG_EVENT_SOURCE_TOUCH)
-    return ui::ER_CONSUMED;
+  if (current_drag_event_source_ !=
+      ui::DragDropTypes::DRAG_EVENT_SOURCE_TOUCH) {
+    event->StopPropagation();
+    return;
+  }
 
   // Apply kTouchDragImageVerticalOffset to the location.
   ui::GestureEvent touch_offset_event(*event,
                                       static_cast<aura::Window*>(NULL),
                                       static_cast<aura::Window*>(NULL));
   gfx::Point touch_offset_location = touch_offset_event.location();
   gfx::Point touch_offset_root_location = touch_offset_event.root_location();
   touch_offset_location.Offset(0, kTouchDragImageVerticalOffset);
   touch_offset_root_location.Offset(0, kTouchDragImageVerticalOffset);
   touch_offset_event.set_location(touch_offset_location);
   touch_offset_event.set_root_location(touch_offset_root_location);
 
   aura::Window* translated_target =
       drag_drop_tracker_->GetTarget(touch_offset_event);
   if (!translated_target) {
     DragCancel();
-    return ui::ER_HANDLED;
+    event->SetHandled();
+    return;
   }
   scoped_ptr<ui::LocatedEvent> translated_event(
       drag_drop_tracker_->ConvertEvent(translated_target, touch_offset_event));
 
   switch (event->type()) {
     case ui::ET_GESTURE_SCROLL_UPDATE:
       DragUpdate(translated_target, *translated_event.get());
       break;
     case ui::ET_GESTURE_SCROLL_END:
       Drop(translated_target, *translated_event.get());
       break;
     case ui::ET_SCROLL_FLING_START:
     case ui::ET_GESTURE_LONG_TAP:
       // Ideally we would want to just forward this long tap event to the
       // |drag_source_window_|. However, webkit does not accept events while a
       // drag drop is still in progress. The drag drop ends only when the nested
       // message loop ends. Due to this stupidity, we have to defer forwarding
       // the long tap.
       pending_long_tap_.reset(
           new ui::GestureEvent(*event,
               static_cast<aura::Window*>(drag_drop_tracker_->capture_window()),
               static_cast<aura::Window*>(drag_source_window_)));
       DoDragCancel(kTouchCancelAnimationDuration);
       break;
     default:
       break;
   }
-  return ui::ER_HANDLED;
+  event->SetHandled();
 }
 
 void DragDropController::OnWindowDestroyed(aura::Window* window) {
   if (drag_window_ == window) {
     drag_window_->RemoveObserver(this);
     drag_window_ = NULL;
   }
   if (drag_source_window_ == window) {
     drag_source_window_->RemoveObserver(this);
     drag_source_window_ = NULL;
@@ skipping 88 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