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 #ifndef ASH_MUS_BRIDGE_WM_SHELL_MUS_H_ | 5 #ifndef ASH_MUS_BRIDGE_WM_SHELL_MUS_H_ |
6 #define ASH_MUS_BRIDGE_WM_SHELL_MUS_H_ | 6 #define ASH_MUS_BRIDGE_WM_SHELL_MUS_H_ |
7 | 7 |
8 #include <stdint.h> | 8 #include <stdint.h> |
9 | 9 |
10 #include <memory> | 10 #include <memory> |
(...skipping 18 matching lines...) Expand all Loading... |
29 | 29 |
30 class AcceleratorControllerDelegateMus; | 30 class AcceleratorControllerDelegateMus; |
31 class AcceleratorControllerRegistrar; | 31 class AcceleratorControllerRegistrar; |
32 class ImmersiveHandlerFactoryMus; | 32 class ImmersiveHandlerFactoryMus; |
33 class WindowManager; | 33 class WindowManager; |
34 class WmShellMusTestApi; | 34 class WmShellMusTestApi; |
35 | 35 |
36 // WmShell implementation for mus. | 36 // WmShell implementation for mus. |
37 class WmShellMus : public WmShell { | 37 class WmShellMus : public WmShell { |
38 public: | 38 public: |
| 39 // If |create_session_state_delegate_stub| is true SessionStateDelegateStub is |
| 40 // created. If false, the SessionStateDelegate from Shell is used. |
39 WmShellMus(WmWindow* primary_root_window, | 41 WmShellMus(WmWindow* primary_root_window, |
40 std::unique_ptr<ShellDelegate> shell_delegate, | 42 std::unique_ptr<ShellDelegate> shell_delegate, |
41 WindowManager* window_manager, | 43 WindowManager* window_manager, |
42 views::PointerWatcherEventRouter* pointer_watcher_event_router); | 44 views::PointerWatcherEventRouter* pointer_watcher_event_router, |
| 45 bool create_session_state_delegate_stub); |
43 ~WmShellMus() override; | 46 ~WmShellMus() override; |
44 | 47 |
45 static WmShellMus* Get(); | 48 static WmShellMus* Get(); |
46 | 49 |
47 ash::RootWindowController* GetRootWindowControllerWithDisplayId(int64_t id); | 50 ash::RootWindowController* GetRootWindowControllerWithDisplayId(int64_t id); |
48 | 51 |
49 AcceleratorControllerDelegateMus* accelerator_controller_delegate() { | 52 AcceleratorControllerDelegateMus* accelerator_controller_delegate() { |
50 return accelerator_controller_delegate_.get(); | 53 return accelerator_controller_delegate_.get(); |
51 } | 54 } |
52 | 55 |
(...skipping 76 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
129 std::unique_ptr<ImmersiveHandlerFactoryMus> immersive_handler_factory_; | 132 std::unique_ptr<ImmersiveHandlerFactoryMus> immersive_handler_factory_; |
130 std::unique_ptr<SessionStateDelegate> session_state_delegate_; | 133 std::unique_ptr<SessionStateDelegate> session_state_delegate_; |
131 | 134 |
132 DISALLOW_COPY_AND_ASSIGN(WmShellMus); | 135 DISALLOW_COPY_AND_ASSIGN(WmShellMus); |
133 }; | 136 }; |
134 | 137 |
135 } // namespace mus | 138 } // namespace mus |
136 } // namespace ash | 139 } // namespace ash |
137 | 140 |
138 #endif // ASH_MUS_BRIDGE_WM_SHELL_MUS_H_ | 141 #endif // ASH_MUS_BRIDGE_WM_SHELL_MUS_H_ |
OLD | NEW |