| Index: ash/wm/event_client_impl.cc
|
| diff --git a/ash/wm/event_client_impl.cc b/ash/wm/event_client_impl.cc
|
| index de3aa14b5128a428d9a7f05046dc4dcf8a2e9008..5bfb13ac5fb8d6874b9043aaedec36f0559a4f93 100644
|
| --- a/ash/wm/event_client_impl.cc
|
| +++ b/ash/wm/event_client_impl.cc
|
| @@ -12,11 +12,9 @@
|
|
|
| namespace ash {
|
|
|
| -EventClientImpl::EventClientImpl() {
|
| -}
|
| +EventClientImpl::EventClientImpl() {}
|
|
|
| -EventClientImpl::~EventClientImpl() {
|
| -}
|
| +EventClientImpl::~EventClientImpl() {}
|
|
|
| bool EventClientImpl::CanProcessEventsWithinSubtree(
|
| const aura::Window* window) const {
|
| @@ -29,24 +27,21 @@ bool EventClientImpl::CanProcessEventsWithinSubtree(
|
| }
|
|
|
| const aura::Window* lock_screen_containers = Shell::GetContainer(
|
| - root_window,
|
| - kShellWindowId_LockScreenContainersContainer);
|
| + root_window, kShellWindowId_LockScreenContainersContainer);
|
| const aura::Window* lock_background_containers = Shell::GetContainer(
|
| - root_window,
|
| - kShellWindowId_LockScreenBackgroundContainer);
|
| + root_window, kShellWindowId_LockScreenBackgroundContainer);
|
| const aura::Window* lock_screen_related_containers = Shell::GetContainer(
|
| - root_window,
|
| - kShellWindowId_LockScreenRelatedContainersContainer);
|
| - bool can_process_events = (window->Contains(lock_screen_containers) &&
|
| - window->Contains(lock_background_containers) &&
|
| - window->Contains(lock_screen_related_containers)) ||
|
| + root_window, kShellWindowId_LockScreenRelatedContainersContainer);
|
| + bool can_process_events =
|
| + (window->Contains(lock_screen_containers) &&
|
| + window->Contains(lock_background_containers) &&
|
| + window->Contains(lock_screen_related_containers)) ||
|
| lock_screen_containers->Contains(window) ||
|
| lock_background_containers->Contains(window) ||
|
| lock_screen_related_containers->Contains(window);
|
| if (keyboard::IsKeyboardEnabled()) {
|
| const aura::Window* virtual_keyboard_container = Shell::GetContainer(
|
| - root_window,
|
| - kShellWindowId_VirtualKeyboardContainer);
|
| + root_window, kShellWindowId_VirtualKeyboardContainer);
|
| can_process_events |= (window->Contains(virtual_keyboard_container) ||
|
| virtual_keyboard_container->Contains(window));
|
| }
|
|
|