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

ui/views/corewm/window_modality_controller.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/corewm/window_modality_controller.h"
 
 #include <algorithm>
 
 #include "ui/aura/client/aura_constants.h"
 #include "ui/aura/client/capture_client.h"
@@ skipping 96 matching lines @@
   aura::Window* target = static_cast<aura::Window*>(event->target());
   return GetModalTransient(target) ? ui::ER_CONSUMED : ui::ER_UNHANDLED;
 }
 
 ui::EventResult WindowModalityController::OnMouseEvent(ui::MouseEvent* event) {
   aura::Window* target = static_cast<aura::Window*>(event->target());
   return ProcessLocatedEvent(target, event) ? ui::ER_CONSUMED :
                                               ui::ER_UNHANDLED;
 }
 
-ui::EventResult WindowModalityController::OnTouchEvent(ui::TouchEvent* event) {
+void WindowModalityController::OnTouchEvent(ui::TouchEvent* event) {
   aura::Window* target = static_cast<aura::Window*>(event->target());
-  return ProcessLocatedEvent(target, event) ? ui::ER_CONSUMED :
-                                              ui::ER_UNHANDLED;
+  if (ProcessLocatedEvent(target, event))
+    event->StopPropagation();
 }
 
 void WindowModalityController::OnWindowInitialized(aura::Window* window) {
   windows_.push_back(window);
   window->AddObserver(this);
 }
 
 void WindowModalityController::OnWindowVisibilityChanged(
     aura::Window* window,
     bool visible) {
@@ skipping 17 matching lines @@
   aura::Window* modal_transient_child = GetModalTransient(target);
   if (modal_transient_child && (event->type() == ui::ET_MOUSE_PRESSED ||
                                 event->type() == ui::ET_TOUCH_PRESSED)) {
     AnimateWindow(modal_transient_child, WINDOW_ANIMATION_TYPE_BOUNCE);
   }
   return !!modal_transient_child;
 }
 
 }  // namespace corewm
 }  // namespace views