| 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 | 28 |
| 29 namespace base { | 29 namespace base { |
| 30 class SingleThreadTaskRunner; | 30 class SingleThreadTaskRunner; |
| 31 class Thread; | 31 class Thread; |
| 32 } | 32 } |
| 33 | 33 |
| 34 namespace service_manager { | 34 namespace service_manager { |
| 35 class Connector; | 35 class Connector; |
| 36 } | 36 } |
| 37 | 37 |
| 38 namespace ui { |
| 39 class CursorDataFactoryOzone; |
| 40 } |
| 41 |
| 38 namespace wm { | 42 namespace wm { |
| 39 class WMState; | 43 class WMState; |
| 40 } | 44 } |
| 41 | 45 |
| 42 namespace views { | 46 namespace views { |
| 43 | 47 |
| 44 class DesktopNativeWidgetAura; | 48 class DesktopNativeWidgetAura; |
| 45 class MusClientObserver; | 49 class MusClientObserver; |
| 46 class MusPropertyMirror; | 50 class MusPropertyMirror; |
| 47 class PointerWatcherEventRouter; | 51 class PointerWatcherEventRouter; |
| (...skipping 97 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 145 aura::Window* GetWindowAtScreenPoint(const gfx::Point& point) override; | 149 aura::Window* GetWindowAtScreenPoint(const gfx::Point& point) override; |
| 146 | 150 |
| 147 static MusClient* instance_; | 151 static MusClient* instance_; |
| 148 | 152 |
| 149 service_manager::Identity identity_; | 153 service_manager::Identity identity_; |
| 150 | 154 |
| 151 std::unique_ptr<base::Thread> io_thread_; | 155 std::unique_ptr<base::Thread> io_thread_; |
| 152 | 156 |
| 153 base::ObserverList<MusClientObserver> observer_list_; | 157 base::ObserverList<MusClientObserver> observer_list_; |
| 154 | 158 |
| 159 #if defined(USE_OZONE) |
| 160 std::unique_ptr<ui::CursorDataFactoryOzone> cursor_factory_ozone_; |
| 161 #endif |
| 162 |
| 155 // NOTE: this may be null (creation is based on argument supplied to | 163 // NOTE: this may be null (creation is based on argument supplied to |
| 156 // constructor). | 164 // constructor). |
| 157 std::unique_ptr<wm::WMState> wm_state_; | 165 std::unique_ptr<wm::WMState> wm_state_; |
| 158 | 166 |
| 159 std::unique_ptr<ScreenMus> screen_; | 167 std::unique_ptr<ScreenMus> screen_; |
| 160 | 168 |
| 161 std::unique_ptr<aura::PropertyConverter> property_converter_; | 169 std::unique_ptr<aura::PropertyConverter> property_converter_; |
| 162 std::unique_ptr<MusPropertyMirror> mus_property_mirror_; | 170 std::unique_ptr<MusPropertyMirror> mus_property_mirror_; |
| 163 | 171 |
| 164 std::unique_ptr<aura::WindowTreeClient> window_tree_client_; | 172 std::unique_ptr<aura::WindowTreeClient> window_tree_client_; |
| 165 | 173 |
| 166 std::unique_ptr<PointerWatcherEventRouter> pointer_watcher_event_router_; | 174 std::unique_ptr<PointerWatcherEventRouter> pointer_watcher_event_router_; |
| 167 | 175 |
| 168 ui::mojom::WindowServerTestPtr server_test_ptr_; | 176 ui::mojom::WindowServerTestPtr server_test_ptr_; |
| 169 | 177 |
| 170 DISALLOW_COPY_AND_ASSIGN(MusClient); | 178 DISALLOW_COPY_AND_ASSIGN(MusClient); |
| 171 }; | 179 }; |
| 172 | 180 |
| 173 } // namespace views | 181 } // namespace views |
| 174 | 182 |
| 175 #endif // UI_VIEWS_MUS_MUS_CLIENT_H_ | 183 #endif // UI_VIEWS_MUS_MUS_CLIENT_H_ |
| OLD | NEW |