events: Update mouse-event handlers to not return EventResult.

ash/wm/window_manager_unittest.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/shell.h"
 #include "ash/shell_window_ids.h"
 #include "ash/test/ash_test_base.h"
 #include "ash/test/shell_test_api.h"
 #include "ash/test/test_activation_delegate.h"
 #include "ash/wm/activation_controller.h"
@@ skipping 44 matching lines @@
 
   // Overridden from ui::EventHandler:
   virtual void OnKeyEvent(ui::KeyEvent* event) OVERRIDE {
     aura::test::TestEventHandler::OnKeyEvent(event);
     if (key_result_ & ui::ER_HANDLED)
       event->SetHandled();
     if (key_result_ & ui::ER_CONSUMED)
       event->StopPropagation();
   }
 
-  virtual ui::EventResult OnMouseEvent(ui::MouseEvent* event) OVERRIDE {
-    ui::EventResult result = aura::test::TestEventHandler::OnMouseEvent(event);
-    return mouse_result_ == ui::ER_UNHANDLED ? result : mouse_result_;
+  virtual void OnMouseEvent(ui::MouseEvent* event) OVERRIDE {
+    aura::test::TestEventHandler::OnMouseEvent(event);
+    if (mouse_result_ & ui::ER_HANDLED)
+      event->SetHandled();
+    if (mouse_result_ & ui::ER_CONSUMED)
+      event->StopPropagation();
   }
 
  private:
   ui::EventResult key_result_;
   ui::EventResult mouse_result_;
 
   DISALLOW_COPY_AND_ASSIGN(CustomEventHandler);
 };
 
 }  // namespace
@@ skipping 606 matching lines @@
   EXPECT_TRUE(cursor_manager->IsCursorVisible());
   root_window->AsRootWindowHostDelegate()->OnHostTouchEvent(&touch_pressed2);
   EXPECT_FALSE(cursor_manager->IsCursorVisible());
   root_window->AsRootWindowHostDelegate()->OnHostMouseEvent(&mouse_moved);
   EXPECT_TRUE(cursor_manager->IsCursorVisible());
   root_window->AsRootWindowHostDelegate()->OnHostTouchEvent(&touch_released2);
   EXPECT_TRUE(cursor_manager->IsCursorVisible());
 }
 
 }  // namespace ash