| 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 92 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 103 SessionStateDelegate* GetSessionStateDelegate() override; | 103 SessionStateDelegate* GetSessionStateDelegate() override; |
| 104 void AddDisplayObserver(WmDisplayObserver* observer) override; | 104 void AddDisplayObserver(WmDisplayObserver* observer) override; |
| 105 void RemoveDisplayObserver(WmDisplayObserver* observer) override; | 105 void RemoveDisplayObserver(WmDisplayObserver* observer) override; |
| 106 void AddPointerWatcher(views::PointerWatcher* watcher, | 106 void AddPointerWatcher(views::PointerWatcher* watcher, |
| 107 views::PointerWatcherEventTypes events) override; | 107 views::PointerWatcherEventTypes events) override; |
| 108 void RemovePointerWatcher(views::PointerWatcher* watcher) override; | 108 void RemovePointerWatcher(views::PointerWatcher* watcher) override; |
| 109 void RequestShutdown() override; | 109 void RequestShutdown() override; |
| 110 bool IsTouchDown() override; | 110 bool IsTouchDown() override; |
| 111 void ToggleIgnoreExternalKeyboard() override; | 111 void ToggleIgnoreExternalKeyboard() override; |
| 112 void SetLaserPointerEnabled(bool enabled) override; | 112 void SetLaserPointerEnabled(bool enabled) override; |
| 113 void SetPartialMagnifierEnabled(bool enabled) override; |
| 113 void CreatePointerWatcherAdapter() override; | 114 void CreatePointerWatcherAdapter() override; |
| 114 void CreatePrimaryHost() override; | 115 void CreatePrimaryHost() override; |
| 115 void InitHosts(const ShellInitParams& init_params) override; | 116 void InitHosts(const ShellInitParams& init_params) override; |
| 116 | 117 |
| 117 private: | 118 private: |
| 118 friend class WmShellMusTestApi; | 119 friend class WmShellMusTestApi; |
| 119 | 120 |
| 120 WindowManager* window_manager_; | 121 WindowManager* window_manager_; |
| 121 | 122 |
| 122 WmWindow* primary_root_window_; | 123 WmWindow* primary_root_window_; |
| 123 views::PointerWatcherEventRouter* pointer_watcher_event_router_; | 124 views::PointerWatcherEventRouter* pointer_watcher_event_router_; |
| 124 | 125 |
| 125 std::unique_ptr<AcceleratorControllerDelegateMus> | 126 std::unique_ptr<AcceleratorControllerDelegateMus> |
| 126 accelerator_controller_delegate_; | 127 accelerator_controller_delegate_; |
| 127 std::unique_ptr<AcceleratorControllerRegistrar> | 128 std::unique_ptr<AcceleratorControllerRegistrar> |
| 128 accelerator_controller_registrar_; | 129 accelerator_controller_registrar_; |
| 129 std::unique_ptr<ImmersiveHandlerFactoryMus> immersive_handler_factory_; | 130 std::unique_ptr<ImmersiveHandlerFactoryMus> immersive_handler_factory_; |
| 130 std::unique_ptr<SessionStateDelegate> session_state_delegate_; | 131 std::unique_ptr<SessionStateDelegate> session_state_delegate_; |
| 131 | 132 |
| 132 DISALLOW_COPY_AND_ASSIGN(WmShellMus); | 133 DISALLOW_COPY_AND_ASSIGN(WmShellMus); |
| 133 }; | 134 }; |
| 134 | 135 |
| 135 } // namespace mus | 136 } // namespace mus |
| 136 } // namespace ash | 137 } // namespace ash |
| 137 | 138 |
| 138 #endif // ASH_MUS_BRIDGE_WM_SHELL_MUS_H_ | 139 #endif // ASH_MUS_BRIDGE_WM_SHELL_MUS_H_ |
| OLD | NEW |