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 122 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
133 MusSpecificState(); | 133 MusSpecificState(); |
134 ~MusSpecificState(); | 134 ~MusSpecificState(); |
135 | 135 |
136 std::unique_ptr<PointerWatcherAdapter> pointer_watcher_adapter; | 136 std::unique_ptr<PointerWatcherAdapter> pointer_watcher_adapter; |
137 std::unique_ptr<AcceleratorControllerDelegateAura> | 137 std::unique_ptr<AcceleratorControllerDelegateAura> |
138 accelerator_controller_delegate; | 138 accelerator_controller_delegate; |
139 }; | 139 }; |
140 | 140 |
141 WindowManager* window_manager_; | 141 WindowManager* window_manager_; |
142 | 142 |
| 143 // TODO(sky): remove this once mash supports simple display management. |
143 WmWindow* primary_root_window_; | 144 WmWindow* primary_root_window_; |
144 | 145 |
145 // Only one of |mash_state_| or |mus_state_| is created, depending upon | 146 // Only one of |mash_state_| or |mus_state_| is created, depending upon |
146 // Config. | 147 // Config. |
147 std::unique_ptr<MashSpecificState> mash_state_; | 148 std::unique_ptr<MashSpecificState> mash_state_; |
148 std::unique_ptr<MusSpecificState> mus_state_; | 149 std::unique_ptr<MusSpecificState> mus_state_; |
149 | 150 |
150 std::unique_ptr<SessionStateDelegate> session_state_delegate_; | 151 std::unique_ptr<SessionStateDelegate> session_state_delegate_; |
151 | 152 |
152 DISALLOW_COPY_AND_ASSIGN(ShellPortMash); | 153 DISALLOW_COPY_AND_ASSIGN(ShellPortMash); |
153 }; | 154 }; |
154 | 155 |
155 } // namespace mus | 156 } // namespace mus |
156 } // namespace ash | 157 } // namespace ash |
157 | 158 |
158 #endif // ASH_MUS_BRIDGE_SHELL_PORT_MASH_H_ | 159 #endif // ASH_MUS_BRIDGE_SHELL_PORT_MASH_H_ |
OLD | NEW |