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

ash/wm/toplevel_window_event_handler.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/wm/toplevel_window_event_handler.h"
 
 #include "ash/shell.h"
 #include "ash/wm/property_util.h"
 #include "ash/wm/resize_shadow_controller.h"
 #include "ash/wm/window_resizer.h"
@@ skipping 138 matching lines @@
     case ui::ET_MOUSE_MOVED:
       return HandleMouseMoved(target, event);
     case ui::ET_MOUSE_EXITED:
       return HandleMouseExited(target, event);
     default:
       break;
   }
   return ui::ER_UNHANDLED;
 }
 
-ui::EventResult ToplevelWindowEventHandler::OnGestureEvent(
-    ui::GestureEvent* event) {
+void ToplevelWindowEventHandler::OnGestureEvent(ui::GestureEvent* event) {
   aura::Window* target = static_cast<aura::Window*>(event->target());
   if (!target->delegate())
-    return ui::ER_UNHANDLED;
+    return;
 
   switch (event->type()) {
     case ui::ET_GESTURE_SCROLL_BEGIN: {
       int component =
           target->delegate()->GetNonClientComponent(event->location());
       if (WindowResizer::GetBoundsChangeForWindowComponent(component) == 0) {
         window_resizer_.reset();
-        return ui::ER_UNHANDLED;
+        return;
       }
       in_gesture_drag_ = true;
       gfx::Point location_in_parent(
           ConvertPointToParent(target, event->location()));
       CreateScopedWindowResizer(target, location_in_parent, component);
       break;
     }
     case ui::ET_GESTURE_SCROLL_UPDATE: {
       if (!in_gesture_drag_)
-        return ui::ER_UNHANDLED;
+        return;
       HandleDrag(target, event);
       break;
     }
     case ui::ET_GESTURE_SCROLL_END:
     case ui::ET_SCROLL_FLING_START: {
       if (!in_gesture_drag_)
-        return ui::ER_UNHANDLED;
+        return;
 
       CompleteDrag(DRAG_COMPLETE, event->flags());
       if (in_move_loop_) {
         quit_closure_.Run();
         in_move_loop_ = false;
       }
       in_gesture_drag_ = false;
 
-      if (event->type() == ui::ET_GESTURE_SCROLL_END)
-        return ui::ER_CONSUMED;
+      if (event->type() == ui::ET_GESTURE_SCROLL_END) {
+        event->StopPropagation();
+        return;
+      }
 
       int component =
           target->delegate()->GetNonClientComponent(event->location());
       if (WindowResizer::GetBoundsChangeForWindowComponent(component) == 0)
-        return ui::ER_UNHANDLED;
+        return;
       if (!wm::IsWindowNormal(target))
-        return ui::ER_UNHANDLED;
+        return;
 
       if (fabs(event->details().velocity_y()) >
           kMinVertVelocityForWindowMinimize) {
         // Minimize/maximize.
         if (event->details().velocity_y() > 0)
           wm::MinimizeWindow(target);
         else if (wm::CanMaximizeWindow(target))
           wm::MaximizeWindow(target);
       } else if (fabs(event->details().velocity_x()) >
                  kMinHorizVelocityForWindowSwipe) {
         // Snap left/right.
         ui::ScopedLayerAnimationSettings scoped_setter(
             target->layer()->GetAnimator());
         scoped_setter.SetPreemptionStrategy(
             ui::LayerAnimator::REPLACE_QUEUED_ANIMATIONS);
         internal::SnapSizer::SnapWindow(target,
             event->details().velocity_x() < 0 ?
             internal::SnapSizer::LEFT_EDGE : internal::SnapSizer::RIGHT_EDGE);
       }
       break;
     }
     default:
-      return ui::ER_UNHANDLED;
+      return;
   }
 
-  return ui::ER_CONSUMED;
+  event->StopPropagation();
 }
 
 aura::client::WindowMoveResult ToplevelWindowEventHandler::RunMoveLoop(
     aura::Window* source,
     const gfx::Vector2d& drag_offset) {
   DCHECK(!in_move_loop_);  // Can only handle one nested loop at a time.
   in_move_loop_ = true;
   move_cancelled_ = false;
   aura::RootWindow* root_window = source->GetRootWindow();
   DCHECK(root_window);
@@ skipping 188 matching lines @@
 void ToplevelWindowEventHandler::ResizerWindowDestroyed() {
   // We explicitly don't invoke RevertDrag() since that may do things to window.
   // Instead we destroy the resizer.
   window_resizer_.reset();
 
   // End the move loop. This does nothing if we're not in a move loop.
   EndMoveLoop();
 }
 
 }  // namespace ash