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

Unified Diff: ash/wm/window_cycle_controller.cc

Issue 11364062: ui: Remove TouchStatus in favour of EventResult. (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: . Created 8 years, 1 month 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/wm/user_activity_detector.cc ('k') | ash/wm/window_modality_controller.h » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: ash/wm/window_cycle_controller.cc
diff --git a/ash/wm/window_cycle_controller.cc b/ash/wm/window_cycle_controller.cc
index 1e332d3bf148412a7230ee1b5c18894d626b4027..1098ae9e0a601e484e04042e9b468bc3b24f2e63 100644
--- a/ash/wm/window_cycle_controller.cc
+++ b/ash/wm/window_cycle_controller.cc
@@ -38,7 +38,7 @@ class WindowCycleEventFilter : public aura::EventFilter {
ui::KeyEvent* event) OVERRIDE;
virtual bool PreHandleMouseEvent(aura::Window* target,
ui::MouseEvent* event) OVERRIDE;
- virtual ui::TouchStatus PreHandleTouchEvent(
+ virtual ui::EventResult PreHandleTouchEvent(
aura::Window* target,
ui::TouchEvent* event) OVERRIDE;
virtual ui::EventResult PreHandleGestureEvent(
@@ -73,10 +73,10 @@ bool WindowCycleEventFilter::PreHandleMouseEvent(
return false; // Not handled.
}
-ui::TouchStatus WindowCycleEventFilter::PreHandleTouchEvent(
+ui::EventResult WindowCycleEventFilter::PreHandleTouchEvent(
aura::Window* target,
ui::TouchEvent* event) {
- return ui::TOUCH_STATUS_UNKNOWN; // Not handled.
+ return ui::ER_UNHANDLED; // Not handled.
}
ui::EventResult WindowCycleEventFilter::PreHandleGestureEvent(
« no previous file with comments | « ash/wm/user_activity_detector.cc ('k') | ash/wm/window_modality_controller.h » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698