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/mus/bridge/wm_shell_mus.h" | 5 #include "ash/mus/bridge/wm_shell_mus.h" |
6 | 6 |
7 #include <utility> | 7 #include <utility> |
8 | 8 |
9 #include "ash/common/accelerators/accelerator_controller.h" | 9 #include "ash/common/accelerators/accelerator_controller.h" |
10 #include "ash/common/key_event_watcher.h" | 10 #include "ash/common/key_event_watcher.h" |
11 #include "ash/common/session/session_state_delegate.h" | 11 #include "ash/common/session/session_state_delegate.h" |
12 #include "ash/common/shell_delegate.h" | 12 #include "ash/common/shell_delegate.h" |
13 #include "ash/common/shell_observer.h" | 13 #include "ash/common/shell_observer.h" |
14 #include "ash/common/shell_window_ids.h" | |
15 #include "ash/common/system/tray/system_tray_delegate.h" | 14 #include "ash/common/system/tray/system_tray_delegate.h" |
16 #include "ash/common/wallpaper/wallpaper_delegate.h" | 15 #include "ash/common/wallpaper/wallpaper_delegate.h" |
17 #include "ash/common/wm/maximize_mode/maximize_mode_event_handler.h" | 16 #include "ash/common/wm/maximize_mode/maximize_mode_event_handler.h" |
18 #include "ash/common/wm/maximize_mode/scoped_disable_internal_mouse_and_keyboard
.h" | 17 #include "ash/common/wm/maximize_mode/scoped_disable_internal_mouse_and_keyboard
.h" |
19 #include "ash/common/wm/mru_window_tracker.h" | 18 #include "ash/common/wm/mru_window_tracker.h" |
20 #include "ash/common/wm/window_cycle_event_filter.h" | 19 #include "ash/common/wm/window_cycle_event_filter.h" |
21 #include "ash/common/wm/window_resizer.h" | 20 #include "ash/common/wm/window_resizer.h" |
22 #include "ash/common/wm_activation_observer.h" | 21 #include "ash/common/wm_activation_observer.h" |
23 #include "ash/mus/accelerators/accelerator_controller_delegate_mus.h" | 22 #include "ash/mus/accelerators/accelerator_controller_delegate_mus.h" |
24 #include "ash/mus/accelerators/accelerator_controller_registrar.h" | 23 #include "ash/mus/accelerators/accelerator_controller_registrar.h" |
25 #include "ash/mus/bridge/immersive_handler_factory_mus.h" | 24 #include "ash/mus/bridge/immersive_handler_factory_mus.h" |
26 #include "ash/mus/bridge/wm_root_window_controller_mus.h" | 25 #include "ash/mus/bridge/wm_root_window_controller_mus.h" |
27 #include "ash/mus/bridge/wm_window_mus.h" | 26 #include "ash/mus/bridge/wm_window_mus.h" |
28 #include "ash/mus/bridge/workspace_event_handler_mus.h" | 27 #include "ash/mus/bridge/workspace_event_handler_mus.h" |
29 #include "ash/mus/container_ids.h" | |
30 #include "ash/mus/drag_window_resizer.h" | 28 #include "ash/mus/drag_window_resizer.h" |
31 #include "ash/mus/keyboard_ui_mus.h" | 29 #include "ash/mus/keyboard_ui_mus.h" |
32 #include "ash/mus/root_window_controller.h" | 30 #include "ash/mus/root_window_controller.h" |
33 #include "ash/mus/window_manager.h" | 31 #include "ash/mus/window_manager.h" |
| 32 #include "ash/public/cpp/shell_window_ids.h" |
34 #include "ash/shared/immersive_fullscreen_controller.h" | 33 #include "ash/shared/immersive_fullscreen_controller.h" |
35 #include "base/memory/ptr_util.h" | 34 #include "base/memory/ptr_util.h" |
36 #include "components/user_manager/user_info_impl.h" | 35 #include "components/user_manager/user_info_impl.h" |
37 #include "services/ui/common/util.h" | 36 #include "services/ui/common/util.h" |
38 #include "services/ui/public/cpp/window.h" | 37 #include "services/ui/public/cpp/window.h" |
39 #include "services/ui/public/cpp/window_tree_client.h" | 38 #include "services/ui/public/cpp/window_tree_client.h" |
40 #include "ui/display/manager/managed_display_info.h" | 39 #include "ui/display/manager/managed_display_info.h" |
41 #include "ui/display/screen.h" | 40 #include "ui/display/screen.h" |
42 #include "ui/views/mus/pointer_watcher_event_router.h" | 41 #include "ui/views/mus/pointer_watcher_event_router.h" |
43 | 42 |
(...skipping 420 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
464 observer.OnWindowActivated(gained_active, lost_active); | 463 observer.OnWindowActivated(gained_active, lost_active); |
465 } | 464 } |
466 | 465 |
467 void WmShellMus::OnDidDestroyClient(ui::WindowTreeClient* client) { | 466 void WmShellMus::OnDidDestroyClient(ui::WindowTreeClient* client) { |
468 DCHECK_EQ(window_tree_client(), client); | 467 DCHECK_EQ(window_tree_client(), client); |
469 client->RemoveObserver(this); | 468 client->RemoveObserver(this); |
470 } | 469 } |
471 | 470 |
472 } // namespace mus | 471 } // namespace mus |
473 } // namespace ash | 472 } // namespace ash |
OLD | NEW |