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

Unified Diff: ash/shell.cc

Issue 2070163002: Fix "modal isn't modal in multi displays" issue (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: rebase Created 4 years, 6 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 | « ash/root_window_controller.cc ('k') | ash/wm/event_client_impl.cc » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: ash/shell.cc
diff --git a/ash/shell.cc b/ash/shell.cc
index 8502d67d961ebd52e41b6dc2b803c9339157352b..44f74894729ef389b59d5b4a66f85993ab35de73 100644
--- a/ash/shell.cc
+++ b/ash/shell.cc
@@ -1178,18 +1178,10 @@ void Shell::InitRootWindow(aura::Window* root_window) {
bool Shell::CanWindowReceiveEvents(aura::Window* window) {
RootWindowControllerList controllers = GetAllRootWindowControllers();
- for (RootWindowControllerList::iterator iter = controllers.begin();
- iter != controllers.end(); ++iter) {
- SystemModalContainerLayoutManager* layout_manager =
- (*iter)->GetSystemModalLayoutManager(window);
- if (layout_manager && layout_manager->CanWindowReceiveEvents(window))
- return true;
- // Allow events to fall through to the virtual keyboard even if displaying
- // a system modal dialog.
- if ((*iter)->IsVirtualKeyboardWindow(window))
+ for (RootWindowController* controller : controllers) {
+ if (controller->CanWindowReceiveEvents(window))
return true;
}
-
return false;
}
« no previous file with comments | « ash/root_window_controller.cc ('k') | ash/wm/event_client_impl.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698