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

content/browser/renderer_host/render_widget_host_view_aura.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 "content/browser/renderer_host/render_widget_host_view_aura.h"
 
 #include "base/bind.h"
 #include "base/bind_helpers.h"
 #include "base/command_line.h"
 #include "base/debug/trace_event.h"
@@ skipping 1664 matching lines @@
                                                               ui::ER_UNHANDLED;
   if (point) {
     if (host_->ShouldForwardTouchEvent())
       host_->ForwardTouchEvent(touch_event_);
     UpdateWebTouchEventAfterDispatch(&touch_event_, point);
   }
 
   return result;
 }
 
-ui::EventResult RenderWidgetHostViewAura::OnGestureEvent(
-    ui::GestureEvent* event) {
+void RenderWidgetHostViewAura::OnGestureEvent(ui::GestureEvent* event) {
   TRACE_EVENT0("browser", "RenderWidgetHostViewAura::OnGestureEvent");
   // Pinch gestures are currently disabled by default. See crbug.com/128477.
   if ((event->type() == ui::ET_GESTURE_PINCH_BEGIN ||
       event->type() == ui::ET_GESTURE_PINCH_UPDATE ||
       event->type() == ui::ET_GESTURE_PINCH_END) && !ShouldSendPinchGesture()) {
-    return ui::ER_CONSUMED;
+    event->SetHandled();
+    return;
   }
 
   RenderViewHostDelegate* delegate = NULL;
   if (popup_type_ == WebKit::WebPopupTypeNone && !is_fullscreen_)
     delegate = RenderViewHost::From(host_)->GetDelegate();
 
   if (delegate && event->type() == ui::ET_GESTURE_BEGIN &&
       event->details().touch_points() == 1) {
     delegate->HandleGestureBegin();
   }
@@ skipping 18 matching lines @@
       RecordAction(UserMetricsAction("TouchscreenScrollFling"));
     }
   }
 
   if (delegate && event->type() == ui::ET_GESTURE_END &&
       event->details().touch_points() == 1) {
     delegate->HandleGestureEnd();
   }
 
   // If a gesture is not processed by the webpage, then WebKit processes it
-  // (e.g. generates synthetic mouse events). So CONSUMED should be returned
-  // from here to avoid any duplicate synthetic mouse-events being generated
-  // from aura.
-  return ui::ER_CONSUMED;
+  // (e.g. generates synthetic mouse events).
+  event->SetHandled();
 }
 
 ////////////////////////////////////////////////////////////////////////////////
 // RenderWidgetHostViewAura, aura::client::ActivationDelegate implementation:
 
 bool RenderWidgetHostViewAura::ShouldActivate() const {
   const ui::Event* event = window_->GetRootWindow()->current_event();
   if (!event)
     return true;
   return is_fullscreen_;
@@ skipping 262 matching lines @@
     RenderWidgetHost* widget) {
   return new RenderWidgetHostViewAura(widget);
 }
 
 // static
 void RenderWidgetHostViewPort::GetDefaultScreenInfo(WebScreenInfo* results) {
   GetScreenInfoForWindow(results, NULL);
 }
 
 }  // namespace content