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_SHELL_PORT_MASH_H_ | 5 #ifndef ASH_MUS_BRIDGE_SHELL_PORT_MASH_H_ |
6 #define ASH_MUS_BRIDGE_SHELL_PORT_MASH_H_ | 6 #define ASH_MUS_BRIDGE_SHELL_PORT_MASH_H_ |
7 | 7 |
8 #include <stdint.h> | 8 #include <stdint.h> |
9 | 9 |
10 #include <memory> | 10 #include <memory> |
(...skipping 86 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
97 void AddDisplayObserver(WmDisplayObserver* observer) override; | 97 void AddDisplayObserver(WmDisplayObserver* observer) override; |
98 void RemoveDisplayObserver(WmDisplayObserver* observer) override; | 98 void RemoveDisplayObserver(WmDisplayObserver* observer) override; |
99 void AddPointerWatcher(views::PointerWatcher* watcher, | 99 void AddPointerWatcher(views::PointerWatcher* watcher, |
100 views::PointerWatcherEventTypes events) override; | 100 views::PointerWatcherEventTypes events) override; |
101 void RemovePointerWatcher(views::PointerWatcher* watcher) override; | 101 void RemovePointerWatcher(views::PointerWatcher* watcher) override; |
102 bool IsTouchDown() override; | 102 bool IsTouchDown() override; |
103 void ToggleIgnoreExternalKeyboard() override; | 103 void ToggleIgnoreExternalKeyboard() override; |
104 void SetLaserPointerEnabled(bool enabled) override; | 104 void SetLaserPointerEnabled(bool enabled) override; |
105 void SetPartialMagnifierEnabled(bool enabled) override; | 105 void SetPartialMagnifierEnabled(bool enabled) override; |
106 void CreatePointerWatcherAdapter() override; | 106 void CreatePointerWatcherAdapter() override; |
| 107 std::unique_ptr<AshWindowTreeHost> CreateAshWindowTreeHost( |
| 108 const AshWindowTreeHostInitParams& init_params) override; |
107 void CreatePrimaryHost() override; | 109 void CreatePrimaryHost() override; |
108 void InitHosts(const ShellInitParams& init_params) override; | 110 void InitHosts(const ShellInitParams& init_params) override; |
| 111 std::unique_ptr<display::NativeDisplayDelegate> CreateNativeDisplayDelegate() |
| 112 override; |
109 std::unique_ptr<AcceleratorController> CreateAcceleratorController() override; | 113 std::unique_ptr<AcceleratorController> CreateAcceleratorController() override; |
110 | 114 |
111 private: | 115 private: |
112 friend class ShellPortMashTestApi; | 116 friend class ShellPortMashTestApi; |
113 | 117 |
114 struct MashSpecificState { | 118 struct MashSpecificState { |
115 MashSpecificState(); | 119 MashSpecificState(); |
116 ~MashSpecificState(); | 120 ~MashSpecificState(); |
117 | 121 |
118 views::PointerWatcherEventRouter* pointer_watcher_event_router = nullptr; | 122 views::PointerWatcherEventRouter* pointer_watcher_event_router = nullptr; |
(...skipping 24 matching lines...) Expand all Loading... |
143 | 147 |
144 std::unique_ptr<SessionStateDelegate> session_state_delegate_; | 148 std::unique_ptr<SessionStateDelegate> session_state_delegate_; |
145 | 149 |
146 DISALLOW_COPY_AND_ASSIGN(ShellPortMash); | 150 DISALLOW_COPY_AND_ASSIGN(ShellPortMash); |
147 }; | 151 }; |
148 | 152 |
149 } // namespace mus | 153 } // namespace mus |
150 } // namespace ash | 154 } // namespace ash |
151 | 155 |
152 #endif // ASH_MUS_BRIDGE_SHELL_PORT_MASH_H_ | 156 #endif // ASH_MUS_BRIDGE_SHELL_PORT_MASH_H_ |
OLD | NEW |