ash/wm/window_modality_controller.cc - Issue 11364062: ui: Remove TouchStatus in favour of EventResult.

Keyboard Shortcuts

	File
u :	up to issue
j / k :	jump to file after / before current file
J / K :	jump to next file with a comment after / before current file
	Side-by-side diff
i :	toggle intra-line diffs
e :	expand all comments
c :	collapse all comments
s :	toggle showing all comments
n / p :	next / previous diff chunk or comment
N / P :	next / previous comment
<Up> / <Down> :	next / previous line

	Issue
u :	up to list of issues
j / k :	jump to patch after / before current patch
o / <Enter> :	open current patch in side-by-side view
i :	open current patch in unified diff view

	Issue List
j / k :	jump to issue after / before current issue
o / <Enter> :	open current issue

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:

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(