| 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 21 matching lines...) Expand all Loading... |
| 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 | 39 // If |create_session_state_delegate_stub| is true SessionStateDelegateStub is |
| 40 // created. If false, the SessionStateDelegate from Shell is used. | 40 // created. If false, the SessionStateDelegate from Shell is used. |
| 41 WmShellMus(WmWindow* primary_root_window, | 41 WmShellMus(WmWindow* primary_root_window, |
| 42 std::unique_ptr<ShellDelegate> shell_delegate, | |
| 43 WindowManager* window_manager, | 42 WindowManager* window_manager, |
| 44 views::PointerWatcherEventRouter* pointer_watcher_event_router, | 43 views::PointerWatcherEventRouter* pointer_watcher_event_router, |
| 45 bool create_session_state_delegate_stub); | 44 bool create_session_state_delegate_stub); |
| 46 ~WmShellMus() override; | 45 ~WmShellMus() override; |
| 47 | 46 |
| 48 static WmShellMus* Get(); | 47 static WmShellMus* Get(); |
| 49 | 48 |
| 50 ash::RootWindowController* GetRootWindowControllerWithDisplayId(int64_t id); | 49 ash::RootWindowController* GetRootWindowControllerWithDisplayId(int64_t id); |
| 51 | 50 |
| 52 AcceleratorControllerDelegateMus* accelerator_controller_delegate() { | 51 AcceleratorControllerDelegateMus* accelerator_controller_delegate() { |
| (...skipping 72 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 125 std::unique_ptr<ImmersiveHandlerFactoryMus> immersive_handler_factory_; | 124 std::unique_ptr<ImmersiveHandlerFactoryMus> immersive_handler_factory_; |
| 126 std::unique_ptr<SessionStateDelegate> session_state_delegate_; | 125 std::unique_ptr<SessionStateDelegate> session_state_delegate_; |
| 127 | 126 |
| 128 DISALLOW_COPY_AND_ASSIGN(WmShellMus); | 127 DISALLOW_COPY_AND_ASSIGN(WmShellMus); |
| 129 }; | 128 }; |
| 130 | 129 |
| 131 } // namespace mus | 130 } // namespace mus |
| 132 } // namespace ash | 131 } // namespace ash |
| 133 | 132 |
| 134 #endif // ASH_MUS_BRIDGE_WM_SHELL_MUS_H_ | 133 #endif // ASH_MUS_BRIDGE_WM_SHELL_MUS_H_ |
| OLD | NEW |