| 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 UI_VIEWS_MUS_MUS_CLIENT_H_ | 5 #ifndef UI_VIEWS_MUS_MUS_CLIENT_H_ |
| 6 #define UI_VIEWS_MUS_MUS_CLIENT_H_ | 6 #define UI_VIEWS_MUS_MUS_CLIENT_H_ |
| 7 | 7 |
| 8 #include <stdint.h> | 8 #include <stdint.h> |
| 9 | 9 |
| 10 #include <map> | 10 #include <map> |
| (...skipping 12 matching lines...) Expand all Loading... |
| 23 class PropertyConverter; | 23 class PropertyConverter; |
| 24 class Window; | 24 class Window; |
| 25 class WindowTreeClient; | 25 class WindowTreeClient; |
| 26 } | 26 } |
| 27 | 27 |
| 28 namespace base { | 28 namespace base { |
| 29 class SingleThreadTaskRunner; | 29 class SingleThreadTaskRunner; |
| 30 class Thread; | 30 class Thread; |
| 31 } | 31 } |
| 32 | 32 |
| 33 namespace discardable_memory { | |
| 34 class ClientDiscardableSharedMemoryManager; | |
| 35 } | |
| 36 | |
| 37 namespace service_manager { | 33 namespace service_manager { |
| 38 class Connector; | 34 class Connector; |
| 39 } | 35 } |
| 40 | 36 |
| 41 namespace wm { | 37 namespace wm { |
| 42 class WMState; | 38 class WMState; |
| 43 } | 39 } |
| 44 | 40 |
| 45 namespace views { | 41 namespace views { |
| 46 | 42 |
| (...skipping 107 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 154 | 150 |
| 155 std::unique_ptr<ScreenMus> screen_; | 151 std::unique_ptr<ScreenMus> screen_; |
| 156 | 152 |
| 157 std::unique_ptr<aura::PropertyConverter> property_converter_; | 153 std::unique_ptr<aura::PropertyConverter> property_converter_; |
| 158 std::unique_ptr<MusPropertyMirror> mus_property_mirror_; | 154 std::unique_ptr<MusPropertyMirror> mus_property_mirror_; |
| 159 | 155 |
| 160 std::unique_ptr<aura::WindowTreeClient> window_tree_client_; | 156 std::unique_ptr<aura::WindowTreeClient> window_tree_client_; |
| 161 | 157 |
| 162 std::unique_ptr<PointerWatcherEventRouter> pointer_watcher_event_router_; | 158 std::unique_ptr<PointerWatcherEventRouter> pointer_watcher_event_router_; |
| 163 | 159 |
| 164 std::unique_ptr<discardable_memory::ClientDiscardableSharedMemoryManager> | |
| 165 discardable_shared_memory_manager_; | |
| 166 | |
| 167 DISALLOW_COPY_AND_ASSIGN(MusClient); | 160 DISALLOW_COPY_AND_ASSIGN(MusClient); |
| 168 }; | 161 }; |
| 169 | 162 |
| 170 } // namespace views | 163 } // namespace views |
| 171 | 164 |
| 172 #endif // UI_VIEWS_MUS_MUS_CLIENT_H_ | 165 #endif // UI_VIEWS_MUS_MUS_CLIENT_H_ |
| OLD | NEW |