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

ash/magnifier/magnification_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 "ash/magnifier/magnification_controller.h"
 
 #include "ash/shell.h"
 #include "ash/shell_delegate.h"
 #include "ash/system/tray/system_tray_delegate.h"
 #include "ui/aura/client/cursor_client.h"
@@ skipping 97 matching lines @@
   // Returns the rect of the magnification window.
   gfx::RectF GetWindowRectDIP(float scale) const;
   // Returns the size of the root window.
   gfx::Size GetHostSizeDIP() const;
 
   // Correct the givin scale value if nessesary.
   void ValidateScale(float* scale);
 
   // ui::EventHandler overrides:
   virtual ui::EventResult OnMouseEvent(ui::MouseEvent* event) OVERRIDE;
-  virtual ui::EventResult OnScrollEvent(ui::ScrollEvent* event) OVERRIDE;
+  virtual void OnScrollEvent(ui::ScrollEvent* event) OVERRIDE;
 
   aura::RootWindow* root_window_;
 
   // True if the magnified window is currently animating a change. Otherwise,
   // false.
   bool is_on_animation_;
 
   bool is_enabled_;
 
   // True if the cursor needs to move the given position after the animation
@@ skipping 370 matching lines @@
       if (current_root != root_window_)
         SwitchTargetRootWindow(current_root);
 
       OnMouseMove(event->root_location());
     }
   }
 
   return ui::ER_UNHANDLED;
 }
 
-ui::EventResult MagnificationControllerImpl::OnScrollEvent(
+void MagnificationControllerImpl::OnScrollEvent(
     ui::ScrollEvent* event) {
   if (event->IsAltDown() && event->IsControlDown()) {
     if (event->type() == ui::ET_SCROLL_FLING_START ||
         event->type() == ui::ET_SCROLL_FLING_CANCEL) {
-      return ui::ER_CONSUMED;
+      event->StopPropagation();
+      return;
     }
 
     if (event->type() == ui::ET_SCROLL) {
       ui::ScrollEvent* scroll_event = static_cast<ui::ScrollEvent*>(event);
       float scale = GetScale();
       scale += scroll_event->y_offset() * kScrollScaleChangeFactor;
       SetScale(scale, true);
-      return ui::ER_CONSUMED;
+      event->StopPropagation();
+      return;
     }
   }
-
-  return ui::ER_UNHANDLED;
 }
 
 ////////////////////////////////////////////////////////////////////////////////
 // MagnificationController:
 
 // static
 MagnificationController* MagnificationController::CreateInstance() {
   return new MagnificationControllerImpl();
 }
 
 }  // namespace ash