Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(159)

Unified Diff: ash/magnifier/magnification_controller.cc

Issue 11592011: events: Update mouse-event handlers to not return EventResult. (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: Created 8 years ago
Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.
Jump to:
View side-by-side diff with in-line comments
Download patch
« no previous file with comments | « ash/launcher/launcher_tooltip_manager_unittest.cc ('k') | ash/magnifier/partial_magnification_controller.h » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
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(
« no previous file with comments | « ash/launcher/launcher_tooltip_manager_unittest.cc ('k') | ash/magnifier/partial_magnification_controller.h » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698