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

Unified Diff: components/exo/pointer.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
Index: components/exo/pointer.cc
diff --git a/components/exo/pointer.cc b/components/exo/pointer.cc
index 5640ae93c59f81a7630688fa04c4b1cd93872a17..1e0fa05370942e38510926a7f2fafbbde59b1144 100644
--- a/components/exo/pointer.cc
+++ b/components/exo/pointer.cc
@@ -125,6 +125,12 @@ void Pointer::SetCursor(Surface* surface, const gfx::Point& hotspot) {
void Pointer::OnMouseEvent(ui::MouseEvent* event) {
Surface* target = GetEffectiveTargetForEvent(event);
+ if (!ash::Shell::GetInstance()->CanWindowReceiveEvents(
+ static_cast<aura::Window*>(event->target()))) {
+ event->StopPropagation();
+ return;
+ }
+
// If target is different than the current pointer focus then we need to
// generate enter and leave events.
if (target != focus_) {

Powered by Google App Engine
This is Rietveld 408576698