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

Unified Diff: services/window_manager/view_targeter.cc

Issue 909913004: Changes event-root to deliver-events-to-parent (Closed) Base URL: https://github.com/domokit/mojo.git@master
Patch Set: remove extraneous changes Created 5 years, 10 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
« no previous file with comments | « services/view_manager/connection_manager.cc ('k') | no next file » | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: services/window_manager/view_targeter.cc
diff --git a/services/window_manager/view_targeter.cc b/services/window_manager/view_targeter.cc
index b699277eb1565e6a498a3fc0255eea1baa1dd126..212f0d32df8d391e9a5412fe449677876f34c662 100644
--- a/services/window_manager/view_targeter.cc
+++ b/services/window_manager/view_targeter.cc
@@ -42,8 +42,6 @@ ui::EventTarget* ViewTargeter::FindTargetForLocatedEvent(
return target;
}
}
- if (view->view()->shared_properties().count("event-root"))
- return view;
return EventTargeter::FindTargetForLocatedEvent(view, event);
}
@@ -58,6 +56,11 @@ bool ViewTargeter::SubtreeCanAcceptEvent(ui::EventTarget* target,
// we have a check here about
// WindowDelegate::ShouldDescendIntoChildForEventHandling().
+ // TODO(sky): decide if we really want this. If we do, it should be a public
+ // constant and documented.
+ if (view->view()->shared_properties().count("deliver-events-to-parent"))
+ return false;
+
return true;
}
« no previous file with comments | « services/view_manager/connection_manager.cc ('k') | no next file » | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698