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

Unified Diff: ash/wm/event_client_impl.cc

Issue 2876993002: Introduce window container to be used by lock screen app windows (Closed)
Patch Set: . Created 3 years, 7 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/tray_action/tray_action_unittest.cc ('k') | ash/wm/lock_action_handler_layout_manager.h » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: ash/wm/event_client_impl.cc
diff --git a/ash/wm/event_client_impl.cc b/ash/wm/event_client_impl.cc
index 7fbc2bf7361c3d00d4d5a288c1304d2b0c576aa5..c7f1e90c9cde178fbadc2821c07543bac03f3a81 100644
--- a/ash/wm/event_client_impl.cc
+++ b/ash/wm/event_client_impl.cc
@@ -7,6 +7,7 @@
#include "ash/public/cpp/shell_window_ids.h"
#include "ash/session/session_controller.h"
#include "ash/shell.h"
+#include "ash/tray_action/tray_action.h"
#include "ui/aura/window.h"
#include "ui/keyboard/keyboard_util.h"
@@ -32,11 +33,15 @@ bool EventClientImpl::CanProcessEventsWithinSubtree(
root_window, kShellWindowId_LockScreenWallpaperContainer);
const aura::Window* lock_screen_related_containers = Shell::GetContainer(
root_window, kShellWindowId_LockScreenRelatedContainersContainer);
+ const aura::Window* lock_action_handler_container = Shell::GetContainer(
+ root_window, kShellWindowId_LockActionHandlerContainer);
bool can_process_events =
(window->Contains(lock_screen_containers) &&
window->Contains(lock_wallpaper_containers) &&
window->Contains(lock_screen_related_containers)) ||
- lock_screen_containers->Contains(window) ||
+ (lock_screen_containers->Contains(window) &&
+ (!lock_action_handler_container->Contains(window) ||
+ Shell::Get()->tray_action()->IsLockScreenNoteActive())) ||
lock_wallpaper_containers->Contains(window) ||
lock_screen_related_containers->Contains(window);
if (keyboard::IsKeyboardEnabled()) {
« no previous file with comments | « ash/tray_action/tray_action_unittest.cc ('k') | ash/wm/lock_action_handler_layout_manager.h » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698