| 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 17 matching lines...) Expand all Loading... |
| 28 namespace base { | 28 namespace base { |
| 29 class SingleThreadTaskRunner; | 29 class SingleThreadTaskRunner; |
| 30 } | 30 } |
| 31 | 31 |
| 32 namespace service_manager { | 32 namespace service_manager { |
| 33 class Connector; | 33 class Connector; |
| 34 class Identity; | 34 class Identity; |
| 35 } | 35 } |
| 36 | 36 |
| 37 namespace ui { | 37 namespace ui { |
| 38 class GpuService; | 38 class Gpu; |
| 39 } | 39 } |
| 40 | 40 |
| 41 namespace wm { | 41 namespace wm { |
| 42 class WMState; | 42 class WMState; |
| 43 } | 43 } |
| 44 | 44 |
| 45 namespace views { | 45 namespace views { |
| 46 | 46 |
| 47 class MusClientObserver; | 47 class MusClientObserver; |
| 48 class PointerWatcherEventRouter2; | 48 class PointerWatcherEventRouter2; |
| (...skipping 82 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 131 base::ObserverList<MusClientObserver> observer_list_; | 131 base::ObserverList<MusClientObserver> observer_list_; |
| 132 | 132 |
| 133 std::unique_ptr<wm::WMState> wm_state_; | 133 std::unique_ptr<wm::WMState> wm_state_; |
| 134 | 134 |
| 135 std::unique_ptr<ScreenMus> screen_; | 135 std::unique_ptr<ScreenMus> screen_; |
| 136 | 136 |
| 137 std::unique_ptr<aura::PropertyConverter> property_converter_; | 137 std::unique_ptr<aura::PropertyConverter> property_converter_; |
| 138 | 138 |
| 139 std::unique_ptr<aura::WindowTreeClient> window_tree_client_; | 139 std::unique_ptr<aura::WindowTreeClient> window_tree_client_; |
| 140 | 140 |
| 141 std::unique_ptr<ui::GpuService> gpu_service_; | 141 std::unique_ptr<ui::Gpu> gpu_; |
| 142 | 142 |
| 143 std::unique_ptr<PointerWatcherEventRouter2> pointer_watcher_event_router_; | 143 std::unique_ptr<PointerWatcherEventRouter2> pointer_watcher_event_router_; |
| 144 | 144 |
| 145 std::unique_ptr<aura::MusContextFactory> compositor_context_factory_; | 145 std::unique_ptr<aura::MusContextFactory> compositor_context_factory_; |
| 146 | 146 |
| 147 DISALLOW_COPY_AND_ASSIGN(MusClient); | 147 DISALLOW_COPY_AND_ASSIGN(MusClient); |
| 148 }; | 148 }; |
| 149 | 149 |
| 150 } // namespace views | 150 } // namespace views |
| 151 | 151 |
| 152 #endif // UI_VIEWS_MUS_MUS_CLIENT_H_ | 152 #endif // UI_VIEWS_MUS_MUS_CLIENT_H_ |
| OLD | NEW |