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

Unified Diff: ash/wm/window_modality_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/window_modality_controller.h ('k') | ash/wm/workspace/frame_maximize_button.cc » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: ash/wm/window_modality_controller.cc
diff --git a/ash/wm/window_modality_controller.cc b/ash/wm/window_modality_controller.cc
index 711ec990a37d4af2af7b53ebcdc5584e2cf1a66c..0d8e87a939bfde6dbcec44fa3c520a22cc71f20e 100644
--- a/ash/wm/window_modality_controller.cc
+++ b/ash/wm/window_modality_controller.cc
@@ -84,11 +84,11 @@ bool WindowModalityController::PreHandleMouseEvent(aura::Window* target,
return ProcessLocatedEvent(target, event);
}
-ui::TouchStatus WindowModalityController::PreHandleTouchEvent(
+ui::EventResult WindowModalityController::PreHandleTouchEvent(
aura::Window* target,
ui::TouchEvent* event) {
- return ProcessLocatedEvent(target, event) ? ui::TOUCH_STATUS_CONTINUE :
- ui::TOUCH_STATUS_UNKNOWN;
+ return ProcessLocatedEvent(target, event) ? ui::ER_CONSUMED :
+ ui::ER_UNHANDLED;
}
ui::EventResult WindowModalityController::PreHandleGestureEvent(
« no previous file with comments | « ash/wm/window_modality_controller.h ('k') | ash/wm/workspace/frame_maximize_button.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698