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

Unified Diff: ash/wm/system_modal_container_event_filter.cc

Issue 11592011: events: Update mouse-event handlers to not return EventResult. (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: 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 | « ash/wm/system_modal_container_event_filter.h ('k') | ash/wm/toplevel_window_event_handler.h » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: ash/wm/system_modal_container_event_filter.cc
diff --git a/ash/wm/system_modal_container_event_filter.cc b/ash/wm/system_modal_container_event_filter.cc
index da9600f6367c9ae16bdb6d1f57c3d485df7630e7..532bb44acd659ea62ba23d7b6651a2178152e990 100644
--- a/ash/wm/system_modal_container_event_filter.cc
+++ b/ash/wm/system_modal_container_event_filter.cc
@@ -25,11 +25,11 @@ void SystemModalContainerEventFilter::OnKeyEvent(ui::KeyEvent* event) {
event->StopPropagation();
}
-ui::EventResult SystemModalContainerEventFilter::OnMouseEvent(
+void SystemModalContainerEventFilter::OnMouseEvent(
ui::MouseEvent* event) {
aura::Window* target = static_cast<aura::Window*>(event->target());
- return delegate_->CanWindowReceiveEvents(target) ? ui::ER_UNHANDLED :
- ui::ER_CONSUMED;
+ if (!delegate_->CanWindowReceiveEvents(target))
+ event->StopPropagation();
}
} // namespace internal
« no previous file with comments | « ash/wm/system_modal_container_event_filter.h ('k') | ash/wm/toplevel_window_event_handler.h » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698