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

ui/views/view.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.
 
 #define _USE_MATH_DEFINES // For VC++ to get M_PI. This has to be first.
 
 #include "ui/views/view.h"
 
 #include <algorithm>
 #include <cmath>
@@ skipping 865 matching lines @@
 }
 
 ui::EventResult View::OnScrollEvent(ui::ScrollEvent* event) {
   return ui::ER_UNHANDLED;
 }
 
 ui::EventResult View::OnTouchEvent(ui::TouchEvent* event) {
   return ui::ER_UNHANDLED;
 }
 
-ui::EventResult View::OnGestureEvent(ui::GestureEvent* event) {
-  return ui::ER_UNHANDLED;
+void View::OnGestureEvent(ui::GestureEvent* event) {
 }
 
 ui::TextInputClient* View::GetTextInputClient() {
   return NULL;
 }
 
 InputMethod* View::GetInputMethod() {
   Widget* widget = GetWidget();
   return widget ? widget->GetInputMethod() : NULL;
 }
@@ skipping 1094 matching lines @@
   } else {
     OnMouseReleased(event);
   }
   // WARNING: we may have been deleted.
 }
 
 ui::EventResult View::ProcessTouchEvent(ui::TouchEvent* event) {
   return OnTouchEvent(event);
 }
 
-ui::EventResult View::ProcessGestureEvent(ui::GestureEvent* event) {
-  ui::EventResult status = OnGestureEvent(event);
-  if (status != ui::ER_UNHANDLED)
-    return status;
+void View::ProcessGestureEvent(ui::GestureEvent* event) {
+  OnGestureEvent(event);
+  if (event->handled())
+    return;
 
   if (CommandLine::ForCurrentProcess()->HasSwitch(
       switches::kEnableTouchDragDrop)) {
     if (event->type() == ui::ET_GESTURE_LONG_PRESS &&
         (!drag_controller_ || drag_controller_->CanStartDragForView(
             this, event->location(), event->location()))) {
       if (DoDrag(*event, event->location(),
-          ui::DragDropTypes::DRAG_EVENT_SOURCE_TOUCH))
-        return ui::ER_CONSUMED;
+          ui::DragDropTypes::DRAG_EVENT_SOURCE_TOUCH)) {
+        event->StopPropagation();
+        return;
+      }
     }
   }
 
   if (context_menu_controller_ &&
       (event->type() == ui::ET_GESTURE_LONG_PRESS ||
        event->type() == ui::ET_GESTURE_LONG_TAP ||
        event->type() == ui::ET_GESTURE_TWO_FINGER_TAP)) {
     gfx::Point location(event->location());
     ConvertPointToScreen(this, &location);
     ShowContextMenu(location, true);
-    return ui::ER_CONSUMED;
+    event->StopPropagation();
   }
-  return status;
 }
 
 // Accelerators ----------------------------------------------------------------
 
 void View::RegisterPendingAccelerators() {
   if (!accelerators_.get() ||
       registered_accelerator_count_ == accelerators_->size()) {
     // No accelerators are waiting for registration.
     return;
   }
@@ skipping 128 matching lines @@
   ConvertPointToWidget(this, &widget_location);
   GetWidget()->RunShellDrag(this, data, widget_location, drag_operations,
       source);
   return true;
 #else
   return false;
 #endif  // !defined(OS_MACOSX)
 }
 
 }  // namespace views