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

ui/views/controls/button/custom_button.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 "ui/views/controls/button/custom_button.h"
 
 #include "ui/base/accessibility/accessible_view_state.h"
 #include "ui/base/animation/throb_animation.h"
 #include "ui/base/events/event.h"
 #include "ui/base/keycodes/keyboard_codes.h"
@@ skipping 189 matching lines @@
   SetState(STATE_NORMAL);
   // TODO(beng): remove once NotifyClick takes ui::Event.
   ui::MouseEvent synthetic_event(ui::ET_MOUSE_RELEASED,
                                  gfx::Point(),
                                  gfx::Point(),
                                  ui::EF_LEFT_MOUSE_BUTTON);
   NotifyClick(synthetic_event);
   return true;
 }
 
-ui::EventResult CustomButton::OnGestureEvent(ui::GestureEvent* event) {
-  if (state_ == STATE_DISABLED)
-    return Button::OnGestureEvent(event);
+void CustomButton::OnGestureEvent(ui::GestureEvent* event) {
+  if (state_ == STATE_DISABLED) {
+    Button::OnGestureEvent(event);
+    return;
+  }
 
   if (event->type() == ui::ET_GESTURE_TAP && IsTriggerableEvent(*event)) {
     // Set the button state to hot and start the animation fully faded in. The
     // TAP_UP event issued immediately after will set the state to STATE_NORMAL
     // beginning the fade out animation. See http://crbug.com/131184.
     SetState(STATE_HOVERED);
     hover_animation_->Reset(1.0);
     NotifyClick(*event);
-    return ui::ER_CONSUMED;
+    event->StopPropagation();
   } else if (event->type() == ui::ET_GESTURE_TAP_DOWN &&
              ShouldEnterPushedState(*event)) {
     SetState(STATE_PRESSED);
     if (request_focus_on_press_)
       RequestFocus();
-    return ui::ER_CONSUMED;
+    event->StopPropagation();
   } else {
     SetState(STATE_NORMAL);
   }
-  return Button::OnGestureEvent(event);
+  if (!event->handled())
+    Button::OnGestureEvent(event);
 }
 
 bool CustomButton::AcceleratorPressed(const ui::Accelerator& accelerator) {
   SetState(STATE_NORMAL);
   /*
   ui::KeyEvent key_event(ui::ET_KEY_RELEASED, accelerator.key_code(),
                          accelerator.modifiers());
                          */
   // TODO(beng): remove once NotifyClick takes ui::Event.
   ui::MouseEvent synthetic_event(ui::ET_MOUSE_RELEASED,
@@ skipping 82 matching lines @@
   if (!is_add && state_ != STATE_DISABLED)
     SetState(STATE_NORMAL);
 }
 
 void CustomButton::OnBlur() {
   if (IsHotTracked())
     SetState(STATE_NORMAL);
 }
 
 }  // namespace views