| OLD | NEW | 
|---|
| 1 // Copyright 2016 The Chromium Authors. All rights reserved. | 1 // Copyright 2016 The Chromium Authors. All rights reserved. | 
| 2 // Use of this source code is governed by a BSD-style license that can be | 2 // Use of this source code is governed by a BSD-style license that can be | 
| 3 // found in the LICENSE file. | 3 // found in the LICENSE file. | 
| 4 | 4 | 
| 5 #include "ash/aura/wm_shell_aura.h" | 5 #include "ash/aura/wm_shell_aura.h" | 
| 6 | 6 | 
| 7 #include <utility> | 7 #include <utility> | 
| 8 | 8 | 
| 9 #include "ash/aura/key_event_watcher_aura.h" | 9 #include "ash/aura/key_event_watcher_aura.h" | 
| 10 #include "ash/aura/pointer_watcher_adapter.h" | 10 #include "ash/aura/pointer_watcher_adapter.h" | 
| 11 #include "ash/common/session/session_state_delegate.h" |  | 
| 12 #include "ash/common/shell_delegate.h" |  | 
| 13 #include "ash/common/shell_observer.h" |  | 
| 14 #include "ash/common/wm/maximize_mode/scoped_disable_internal_mouse_and_keyboard
     .h" |  | 
| 15 #include "ash/common/wm/mru_window_tracker.h" |  | 
| 16 #include "ash/common/wm/overview/window_selector_controller.h" |  | 
| 17 #include "ash/common/wm_activation_observer.h" |  | 
| 18 #include "ash/common/wm_display_observer.h" |  | 
| 19 #include "ash/common/wm_window.h" |  | 
| 20 #include "ash/display/window_tree_host_manager.h" | 11 #include "ash/display/window_tree_host_manager.h" | 
| 21 #include "ash/host/ash_window_tree_host_init_params.h" | 12 #include "ash/host/ash_window_tree_host_init_params.h" | 
| 22 #include "ash/laser/laser_pointer_controller.h" | 13 #include "ash/laser/laser_pointer_controller.h" | 
| 23 #include "ash/magnifier/partial_magnification_controller.h" | 14 #include "ash/magnifier/partial_magnification_controller.h" | 
| 24 #include "ash/metrics/task_switch_metrics_recorder.h" | 15 #include "ash/metrics/task_switch_metrics_recorder.h" | 
|  | 16 #include "ash/session/session_state_delegate.h" | 
| 25 #include "ash/shared/immersive_fullscreen_controller.h" | 17 #include "ash/shared/immersive_fullscreen_controller.h" | 
| 26 #include "ash/shell.h" | 18 #include "ash/shell.h" | 
|  | 19 #include "ash/shell_delegate.h" | 
|  | 20 #include "ash/shell_observer.h" | 
| 27 #include "ash/touch/touch_uma.h" | 21 #include "ash/touch/touch_uma.h" | 
| 28 #include "ash/virtual_keyboard_controller.h" | 22 #include "ash/virtual_keyboard_controller.h" | 
| 29 #include "ash/wm/drag_window_resizer.h" | 23 #include "ash/wm/drag_window_resizer.h" | 
| 30 #include "ash/wm/maximize_mode/maximize_mode_event_handler_aura.h" | 24 #include "ash/wm/maximize_mode/maximize_mode_event_handler_aura.h" | 
|  | 25 #include "ash/wm/maximize_mode/scoped_disable_internal_mouse_and_keyboard.h" | 
|  | 26 #include "ash/wm/mru_window_tracker.h" | 
|  | 27 #include "ash/wm/overview/window_selector_controller.h" | 
| 31 #include "ash/wm/screen_pinning_controller.h" | 28 #include "ash/wm/screen_pinning_controller.h" | 
| 32 #include "ash/wm/window_cycle_event_filter_aura.h" | 29 #include "ash/wm/window_cycle_event_filter_aura.h" | 
| 33 #include "ash/wm/window_util.h" | 30 #include "ash/wm/window_util.h" | 
| 34 #include "ash/wm/workspace/workspace_event_handler_aura.h" | 31 #include "ash/wm/workspace/workspace_event_handler_aura.h" | 
|  | 32 #include "ash/wm_activation_observer.h" | 
|  | 33 #include "ash/wm_display_observer.h" | 
|  | 34 #include "ash/wm_window.h" | 
| 35 #include "base/memory/ptr_util.h" | 35 #include "base/memory/ptr_util.h" | 
| 36 #include "ui/aura/client/capture_client.h" | 36 #include "ui/aura/client/capture_client.h" | 
| 37 #include "ui/aura/client/focus_client.h" | 37 #include "ui/aura/client/focus_client.h" | 
| 38 #include "ui/aura/env.h" | 38 #include "ui/aura/env.h" | 
| 39 #include "ui/display/manager/display_manager.h" | 39 #include "ui/display/manager/display_manager.h" | 
| 40 | 40 | 
| 41 #if defined(USE_X11) | 41 #if defined(USE_X11) | 
| 42 #include "ash/wm/maximize_mode/scoped_disable_internal_mouse_and_keyboard_x11.h" | 42 #include "ash/wm/maximize_mode/scoped_disable_internal_mouse_and_keyboard_x11.h" | 
| 43 #endif | 43 #endif | 
| 44 | 44 | 
| (...skipping 265 matching lines...) Expand 10 before | Expand all | Expand 10 after  Loading... | 
| 310   for (auto& observer : display_observers_) | 310   for (auto& observer : display_observers_) | 
| 311     observer.OnDisplayConfigurationChanging(); | 311     observer.OnDisplayConfigurationChanging(); | 
| 312 } | 312 } | 
| 313 | 313 | 
| 314 void WmShellAura::OnDisplayConfigurationChanged() { | 314 void WmShellAura::OnDisplayConfigurationChanged() { | 
| 315   for (auto& observer : display_observers_) | 315   for (auto& observer : display_observers_) | 
| 316     observer.OnDisplayConfigurationChanged(); | 316     observer.OnDisplayConfigurationChanged(); | 
| 317 } | 317 } | 
| 318 | 318 | 
| 319 }  // namespace ash | 319 }  // namespace ash | 
| OLD | NEW | 
|---|