events: Update scroll and touch handlers to not return EventResult.

ash/wm/workspace/workspace_cycler.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/workspace/workspace_cycler.h"
 
 #include "ash/shell.h"
 #include "ash/wm/workspace/workspace_manager.h"
 #include "ui/base/events/event.h"
 #include "ui/base/events/event_utils.h"
@@ skipping 21 matching lines @@
       scroll_x_(0),
       scroll_y_(0) {
   ash::Shell::GetInstance()->AddPreTargetHandler(this);
 }
 
 WorkspaceCycler::~WorkspaceCycler() {
   scrubbing_ = false;
   ash::Shell::GetInstance()->RemovePreTargetHandler(this);
 }
 
-ui::EventResult WorkspaceCycler::OnScrollEvent(ui::ScrollEvent* event) {
+void WorkspaceCycler::OnScrollEvent(ui::ScrollEvent* event) {
   if (event->finger_count() != 3 ||
       event->type() != ui::ET_SCROLL) {
     scrubbing_ = false;
-    return ui::ER_UNHANDLED;
+    return;
   }
 
   if (!IsScrubbingEnabled()) {
     scrubbing_ = false;
-    return ui::ER_UNHANDLED;
+    return;
   }
 
   if (!scrubbing_) {
     scrubbing_ = true;
     scroll_x_ = 0;
     scroll_y_ = 0;
   }
 
   if (ui::IsNaturalScrollEnabled()) {
     scroll_x_ += event->x_offset();
     scroll_y_ += event->y_offset();
   } else {
     scroll_x_ -= event->x_offset();
     scroll_y_ -= event->y_offset();
   }
 
   // TODO(pkotwicz): Implement scrubbing through several workspaces as the
   // result of a single scroll event.
   if (std::abs(scroll_y_) > kWorkspaceStepSize) {
     workspace_manager_->CycleToWorkspace(scroll_y_ > 0 ?
         WorkspaceManager::CYCLE_NEXT : WorkspaceManager::CYCLE_PREVIOUS);
 
     scroll_x_ = 0;
     scroll_y_ = 0;
-    return ui::ER_HANDLED;
+    event->SetHandled();
+    return;
   }
 
   if (std::abs(scroll_x_) > kWorkspaceStepSize) {
     // Update |scroll_x_| and |scroll_y_| such that workspaces are only cycled
     // through when there recently was a significant amount of vertical movement
     // as opposed to vertical movement accumulated over a long horizontal three
     // finger scroll.
     scroll_x_ = 0;
     scroll_y_ = 0;
   }
 
   // The active workspace was not changed, do not consume the event.
-  return ui::ER_UNHANDLED;
 }
 
 }  // namespace internal
 }  // namespace ash