Index: ash/magnifier/magnification_controller.cc |
diff --git a/ash/magnifier/magnification_controller.cc b/ash/magnifier/magnification_controller.cc |
index 0912e37dba9b37595313c0c023e06b8514f04a61..b7fd98dbfc204ae1449435060f9e47661f256da9 100644 |
--- a/ash/magnifier/magnification_controller.cc |
+++ b/ash/magnifier/magnification_controller.cc |
@@ -114,7 +114,7 @@ class MagnificationControllerImpl : virtual public MagnificationController, |
void ValidateScale(float* scale); |
// ui::EventHandler overrides: |
- virtual ui::EventResult OnMouseEvent(ui::MouseEvent* event) OVERRIDE; |
+ virtual void OnMouseEvent(ui::MouseEvent* event) OVERRIDE; |
virtual void OnScrollEvent(ui::ScrollEvent* event) OVERRIDE; |
aura::RootWindow* root_window_; |
@@ -488,8 +488,7 @@ bool MagnificationControllerImpl::IsEnabled() const { |
//////////////////////////////////////////////////////////////////////////////// |
// MagnificationControllerImpl: aura::EventFilter implementation |
-ui::EventResult MagnificationControllerImpl::OnMouseEvent( |
- ui::MouseEvent* event) { |
+void MagnificationControllerImpl::OnMouseEvent(ui::MouseEvent* event) { |
if (IsMagnified() && event->type() == ui::ET_MOUSE_MOVED) { |
aura::Window* target = static_cast<aura::Window*>(event->target()); |
aura::RootWindow* current_root = target->GetRootWindow(); |
@@ -502,8 +501,6 @@ ui::EventResult MagnificationControllerImpl::OnMouseEvent( |
OnMouseMove(event->root_location()); |
} |
} |
- |
- return ui::ER_UNHANDLED; |
} |
void MagnificationControllerImpl::OnScrollEvent( |