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

ui/views/widget/desktop_aura/desktop_native_widget_aura.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/widget/desktop_aura/desktop_native_widget_aura.h"
 
 #include "base/bind.h"
 #include "ui/aura/client/stacking_client.h"
 #include "ui/aura/focus_manager.h"
 #include "ui/aura/root_window.h"
@@ skipping 548 matching lines @@
 
   native_widget_delegate_->OnKeyEvent(event);
   if (event->handled())
     return;
 
   if (GetWidget()->HasFocusManager() &&
       !GetWidget()->GetFocusManager()->OnKeyEvent(*event))
     event->SetHandled();
 }
 
-ui::EventResult DesktopNativeWidgetAura::OnMouseEvent(ui::MouseEvent* event) {
+void DesktopNativeWidgetAura::OnMouseEvent(ui::MouseEvent* event) {
   DCHECK(window_->IsVisible());
   if (event->type() == ui::ET_MOUSEWHEEL) {
-    return native_widget_delegate_->OnMouseEvent(*event) ?
-        ui::ER_HANDLED : ui::ER_UNHANDLED;
+    native_widget_delegate_->OnMouseEvent(event);
+    if (event->handled())
+      return;
   }
 
-  return native_widget_delegate_->OnMouseEvent(*event) ?
-      ui::ER_HANDLED : ui::ER_UNHANDLED;
+  native_widget_delegate_->OnMouseEvent(event);
 }
 
 void DesktopNativeWidgetAura::OnScrollEvent(ui::ScrollEvent* event) {
   if (event->type() == ui::ET_SCROLL) {
     native_widget_delegate_->OnScrollEvent(event);
     if (event->handled())
       return;
 
     // Convert unprocessed scroll events into wheel events.
     ui::MouseWheelEvent mwe(*static_cast<ui::ScrollEvent*>(event));
-    if (native_widget_delegate_->OnMouseEvent(mwe))
+    native_widget_delegate_->OnMouseEvent(&mwe);
+    if (mwe.handled())
       event->SetHandled();
   } else {
     native_widget_delegate_->OnScrollEvent(event);
   }
 }
 
 void DesktopNativeWidgetAura::OnTouchEvent(ui::TouchEvent* event) {
   native_widget_delegate_->OnTouchEvent(event);
 }
 
@@ skipping 98 matching lines @@
   drop_helper_->OnDragExit();
 }
 
 int DesktopNativeWidgetAura::OnPerformDrop(const ui::DropTargetEvent& event) {
   DCHECK(drop_helper_.get() != NULL);
   return drop_helper_->OnDrop(event.data(), event.location(),
       last_drop_operation_);
 }
 
 }  // namespace views