ash/wm/system_modal_container_event_filter.cc - Issue 2127263002: Keep the SystemModalContainerEventHandler added

Keyboard Shortcuts

	File
u :	up to issue
j / k :	jump to file after / before current file
J / K :	jump to next file with a comment after / before current file
	Side-by-side diff
i :	toggle intra-line diffs
e :	expand all comments
c :	collapse all comments
s :	toggle showing all comments
n / p :	next / previous diff chunk or comment
N / P :	next / previous comment
<Up> / <Down> :	next / previous line

	Issue
u :	up to list of issues
j / k :	jump to patch after / before current patch
o / <Enter> :	open current patch in side-by-side view
i :	open current patch in unified diff view

	Issue List
j / k :	jump to issue after / before current issue
o / <Enter> :	open current issue

Unified Diff: ash/wm/system_modal_container_event_filter.cc

Issue 2127263002: Keep the SystemModalContainerEventHandler added (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master

Patch Set: Ignore touch/pointer events on Arc windows if modal open 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:

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 5e210534c741134352e49536871944c363dbde5b..6098b7d8b9e70400012d328c61a1ea24f5cf0441 100644

--- a/ash/wm/system_modal_container_event_filter.cc

+++ b/ash/wm/system_modal_container_event_filter.cc

@@ -3,7 +3,7 @@

// found in the LICENSE file.

#include "ash/wm/system_modal_container_event_filter.h"

+#include "ash/common/wm_shell.h"

#include "ash/wm/system_modal_container_event_filter_delegate.h"

#include "ui/aura/window.h"

#include "ui/events/event.h"

@@ -17,6 +17,9 @@ SystemModalContainerEventFilter::SystemModalContainerEventFilter(

SystemModalContainerEventFilter::~SystemModalContainerEventFilter() {}

void SystemModalContainerEventFilter::OnEvent(ui::Event* event) {

+ // Only filter modal events if a modal window is open.

+ if (!WmShell::Get()->IsSystemModalWindowOpen())

+ return;

aura::Window* target = static_cast<aura::Window*>(event->target());

if (!delegate_->CanWindowReceiveEvents(target))

event->StopPropagation();