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

Issues Search
    My Issues | Starred     Open | Closed | All

Unified Diff: components/exo/touch.cc

Issue 2127263002: Keep the SystemModalContainerEventHandler added (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: Created 4 years, 5 months 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
« components/exo/pointer_unittest.cc ('K') | « components/exo/pointer_unittest.cc ('k') | components/exo/touch_unittest.cc » ('j') | components/exo/touch_unittest.cc » ('J')
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: components/exo/touch.cc
diff --git a/components/exo/touch.cc b/components/exo/touch.cc
index 255072270964c5ae08db902ac498371300d6f4bb..7255aa6ea1a7bd585d007141a78294d928f1dfa1 100644
--- a/components/exo/touch.cc
+++ b/components/exo/touch.cc
@@ -46,6 +46,12 @@ Touch::~Touch() {
// ui::EventHandler overrides:
void Touch::OnTouchEvent(ui::TouchEvent* event) {
+ if (!ash::Shell::GetInstance()->CanWindowReceiveEvents(
+ (aura::Window*)event->target())) {
+ event->StopPropagation();
+ return;
+ }
+
switch (event->type()) {
case ui::ET_TOUCH_PRESSED: {
// Early out if event doesn't contain a valid target for touch device.
« components/exo/pointer_unittest.cc ('K') | « components/exo/pointer_unittest.cc ('k') | components/exo/touch_unittest.cc » ('j') | components/exo/touch_unittest.cc » ('J')

Powered by Google App Engine
This is Rietveld 408576698