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/accelerators/accelerator_controller.h" | 9 #include "ash/accelerators/accelerator_controller.h" |
10 #include "ash/common/key_event_watcher.h" | 10 #include "ash/key_event_watcher.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/wallpaper/wallpaper_delegate.h" | |
15 #include "ash/common/wm_window.h" | |
16 #include "ash/mus/accelerators/accelerator_controller_delegate_mus.h" | 11 #include "ash/mus/accelerators/accelerator_controller_delegate_mus.h" |
17 #include "ash/mus/accelerators/accelerator_controller_registrar.h" | 12 #include "ash/mus/accelerators/accelerator_controller_registrar.h" |
18 #include "ash/mus/bridge/immersive_handler_factory_mus.h" | 13 #include "ash/mus/bridge/immersive_handler_factory_mus.h" |
19 #include "ash/mus/bridge/workspace_event_handler_mus.h" | 14 #include "ash/mus/bridge/workspace_event_handler_mus.h" |
20 #include "ash/mus/drag_window_resizer.h" | 15 #include "ash/mus/drag_window_resizer.h" |
21 #include "ash/mus/keyboard_ui_mus.h" | 16 #include "ash/mus/keyboard_ui_mus.h" |
22 #include "ash/mus/screen_mus.h" | 17 #include "ash/mus/screen_mus.h" |
23 #include "ash/mus/window_manager.h" | 18 #include "ash/mus/window_manager.h" |
24 #include "ash/root_window_controller.h" | 19 #include "ash/root_window_controller.h" |
25 #include "ash/root_window_settings.h" | 20 #include "ash/root_window_settings.h" |
| 21 #include "ash/session/session_state_delegate.h" |
26 #include "ash/shared/immersive_fullscreen_controller.h" | 22 #include "ash/shared/immersive_fullscreen_controller.h" |
27 #include "ash/shell.h" | 23 #include "ash/shell.h" |
| 24 #include "ash/shell_delegate.h" |
28 #include "ash/shell_init_params.h" | 25 #include "ash/shell_init_params.h" |
| 26 #include "ash/shell_observer.h" |
29 #include "ash/system/tray/system_tray_delegate.h" | 27 #include "ash/system/tray/system_tray_delegate.h" |
| 28 #include "ash/wallpaper/wallpaper_delegate.h" |
30 #include "ash/wm/maximize_mode/maximize_mode_event_handler.h" | 29 #include "ash/wm/maximize_mode/maximize_mode_event_handler.h" |
31 #include "ash/wm/maximize_mode/scoped_disable_internal_mouse_and_keyboard.h" | 30 #include "ash/wm/maximize_mode/scoped_disable_internal_mouse_and_keyboard.h" |
32 #include "ash/wm/mru_window_tracker.h" | 31 #include "ash/wm/mru_window_tracker.h" |
33 #include "ash/wm/window_cycle_event_filter.h" | 32 #include "ash/wm/window_cycle_event_filter.h" |
34 #include "ash/wm/window_resizer.h" | 33 #include "ash/wm/window_resizer.h" |
35 #include "ash/wm/window_util.h" | 34 #include "ash/wm/window_util.h" |
| 35 #include "ash/wm_window.h" |
36 #include "base/memory/ptr_util.h" | 36 #include "base/memory/ptr_util.h" |
37 #include "components/user_manager/user_info_impl.h" | 37 #include "components/user_manager/user_info_impl.h" |
38 #include "ui/aura/mus/window_tree_client.h" | 38 #include "ui/aura/mus/window_tree_client.h" |
39 #include "ui/aura/mus/window_tree_host_mus.h" | 39 #include "ui/aura/mus/window_tree_host_mus.h" |
40 #include "ui/aura/window.h" | 40 #include "ui/aura/window.h" |
41 #include "ui/display/manager/managed_display_info.h" | 41 #include "ui/display/manager/managed_display_info.h" |
42 #include "ui/display/screen.h" | 42 #include "ui/display/screen.h" |
43 #include "ui/views/mus/pointer_watcher_event_router.h" | 43 #include "ui/views/mus/pointer_watcher_event_router.h" |
44 #include "ui/wm/core/capture_controller.h" | 44 #include "ui/wm/core/capture_controller.h" |
45 #include "ui/wm/core/focus_controller.h" | 45 #include "ui/wm/core/focus_controller.h" |
46 | 46 |
47 namespace ash { | 47 namespace ash { |
48 namespace mus { | 48 namespace mus { |
49 | 49 |
50 namespace { | 50 namespace { |
51 | 51 |
52 // TODO(jamescook): After ShellDelegate is ported to ash/common use | 52 // TODO(jamescook): After ShellDelegate works with mus switching to using |
53 // ShellDelegate::CreateSessionStateDelegate() to construct the mus version | 53 // ShellDelegate::CreateSessionStateDelegate() to construct the mus version |
54 // of SessionStateDelegate. | 54 // of SessionStateDelegate. |
55 class SessionStateDelegateStub : public SessionStateDelegate { | 55 class SessionStateDelegateStub : public SessionStateDelegate { |
56 public: | 56 public: |
57 SessionStateDelegateStub() | 57 SessionStateDelegateStub() |
58 : screen_locked_(false), user_info_(new user_manager::UserInfoImpl()) {} | 58 : screen_locked_(false), user_info_(new user_manager::UserInfoImpl()) {} |
59 | 59 |
60 ~SessionStateDelegateStub() override {} | 60 ~SessionStateDelegateStub() override {} |
61 | 61 |
62 // SessionStateDelegate: | 62 // SessionStateDelegate: |
(...skipping 359 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
422 } | 422 } |
423 | 423 |
424 void WmShellMus::CreatePrimaryHost() {} | 424 void WmShellMus::CreatePrimaryHost() {} |
425 | 425 |
426 void WmShellMus::InitHosts(const ShellInitParams& init_params) { | 426 void WmShellMus::InitHosts(const ShellInitParams& init_params) { |
427 window_manager_->CreatePrimaryRootWindowController( | 427 window_manager_->CreatePrimaryRootWindowController( |
428 base::WrapUnique(init_params.primary_window_tree_host)); | 428 base::WrapUnique(init_params.primary_window_tree_host)); |
429 } | 429 } |
430 } // namespace mus | 430 } // namespace mus |
431 } // namespace ash | 431 } // namespace ash |
OLD | NEW |