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

Unified Diff: ui/views/corewm/window_modality_controller.cc

Issue 11568006: events: Update scroll and touch handlers to not return EventResult. (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: self-nit 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 | « ui/views/corewm/window_modality_controller.h ('k') | ui/views/view.h » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: ui/views/corewm/window_modality_controller.cc
diff --git a/ui/views/corewm/window_modality_controller.cc b/ui/views/corewm/window_modality_controller.cc
index 57bbe3c1ddb78510653dd17393902b510ef4edfb..1e4b4c1ac49cb97fa67320054b7d3a6f8049e049 100644
--- a/ui/views/corewm/window_modality_controller.cc
+++ b/ui/views/corewm/window_modality_controller.cc
@@ -114,10 +114,10 @@ ui::EventResult WindowModalityController::OnMouseEvent(ui::MouseEvent* event) {
ui::ER_UNHANDLED;
}
-ui::EventResult WindowModalityController::OnTouchEvent(ui::TouchEvent* event) {
+void WindowModalityController::OnTouchEvent(ui::TouchEvent* event) {
aura::Window* target = static_cast<aura::Window*>(event->target());
- return ProcessLocatedEvent(target, event) ? ui::ER_CONSUMED :
- ui::ER_UNHANDLED;
+ if (ProcessLocatedEvent(target, event))
+ event->StopPropagation();
}
void WindowModalityController::OnWindowInitialized(aura::Window* window) {
« no previous file with comments | « ui/views/corewm/window_modality_controller.h ('k') | ui/views/view.h » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698