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