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

Unified Diff: ash/magnifier/magnification_controller.cc

Issue 10912063: events: Get rid of GestureStatus in favour of EventResult. (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: . Created 8 years, 3 months 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_view.cc ('k') | ash/system/status_area_widget_delegate.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 cf028cd67d6f42fd9346fc8d9c3ab7ead94c50e8..af31704cf23264ce275d459a115c2d2c72e72ab3 100644
--- a/ash/magnifier/magnification_controller.cc
+++ b/ash/magnifier/magnification_controller.cc
@@ -105,7 +105,7 @@ class MagnificationControllerImpl : virtual public MagnificationController,
virtual ui::TouchStatus PreHandleTouchEvent(
aura::Window* target,
ui::TouchEvent* event) OVERRIDE;
- virtual ui::GestureStatus PreHandleGestureEvent(
+ virtual ui::EventResult PreHandleGestureEvent(
aura::Window* target,
ui::GestureEvent* event) OVERRIDE;
@@ -452,10 +452,10 @@ ui::TouchStatus MagnificationControllerImpl::PreHandleTouchEvent(
return ui::TOUCH_STATUS_UNKNOWN;
}
-ui::GestureStatus MagnificationControllerImpl::PreHandleGestureEvent(
+ui::EventResult MagnificationControllerImpl::PreHandleGestureEvent(
aura::Window* target,
ui::GestureEvent* event) {
- return ui::GESTURE_STATUS_UNKNOWN;
+ return ui::ER_UNHANDLED;
}
////////////////////////////////////////////////////////////////////////////////
« no previous file with comments | « ash/launcher/launcher_view.cc ('k') | ash/system/status_area_widget_delegate.h » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698