| OLD | NEW |
| 1 // Copyright 2014 The Chromium Authors. All rights reserved. | 1 // Copyright 2014 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 SERVICES_UI_SERVICE_H_ | 5 #ifndef SERVICES_UI_SERVICE_H_ |
| 6 #define SERVICES_UI_SERVICE_H_ | 6 #define SERVICES_UI_SERVICE_H_ |
| 7 | 7 |
| 8 #include <stdint.h> | 8 #include <stdint.h> |
| 9 | 9 |
| 10 #include <map> | 10 #include <map> |
| (...skipping 37 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 48 namespace gfx { | 48 namespace gfx { |
| 49 class Rect; | 49 class Rect; |
| 50 } | 50 } |
| 51 | 51 |
| 52 namespace shell { | 52 namespace shell { |
| 53 class Connector; | 53 class Connector; |
| 54 } | 54 } |
| 55 | 55 |
| 56 namespace ui { | 56 namespace ui { |
| 57 | 57 |
| 58 class GpuServiceProxy; |
| 58 class PlatformEventSource; | 59 class PlatformEventSource; |
| 59 | 60 |
| 60 namespace ws { | 61 namespace ws { |
| 61 class ForwardingWindowManager; | 62 class ForwardingWindowManager; |
| 62 class WindowServer; | 63 class WindowServer; |
| 63 } | 64 } |
| 64 | 65 |
| 65 class Service | 66 class Service |
| 66 : public shell::Service, | 67 : public shell::Service, |
| 67 public ws::WindowServerDelegate, | 68 public ws::WindowServerDelegate, |
| (...skipping 107 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 175 UserIdToUserState user_id_to_user_state_; | 176 UserIdToUserState user_id_to_user_state_; |
| 176 | 177 |
| 177 // Provides input-device information via Mojo IPC. | 178 // Provides input-device information via Mojo IPC. |
| 178 InputDeviceServer input_device_server_; | 179 InputDeviceServer input_device_server_; |
| 179 | 180 |
| 180 bool test_config_; | 181 bool test_config_; |
| 181 #if defined(USE_OZONE) | 182 #if defined(USE_OZONE) |
| 182 std::unique_ptr<ui::ClientNativePixmapFactory> client_native_pixmap_factory_; | 183 std::unique_ptr<ui::ClientNativePixmapFactory> client_native_pixmap_factory_; |
| 183 #endif | 184 #endif |
| 184 | 185 |
| 186 std::unique_ptr<GpuServiceProxy> gpu_proxy_; |
| 185 std::unique_ptr<display::PlatformScreen> platform_screen_; | 187 std::unique_ptr<display::PlatformScreen> platform_screen_; |
| 186 std::unique_ptr<ws::TouchController> touch_controller_; | 188 std::unique_ptr<ws::TouchController> touch_controller_; |
| 187 IMERegistrarImpl ime_registrar_; | 189 IMERegistrarImpl ime_registrar_; |
| 188 IMEServerImpl ime_server_; | 190 IMEServerImpl ime_server_; |
| 189 | 191 |
| 190 base::WeakPtrFactory<Service> weak_ptr_factory_; | 192 base::WeakPtrFactory<Service> weak_ptr_factory_; |
| 191 | 193 |
| 192 DISALLOW_COPY_AND_ASSIGN(Service); | 194 DISALLOW_COPY_AND_ASSIGN(Service); |
| 193 }; | 195 }; |
| 194 | 196 |
| 195 } // namespace ui | 197 } // namespace ui |
| 196 | 198 |
| 197 #endif // SERVICES_UI_SERVICE_H_ | 199 #endif // SERVICES_UI_SERVICE_H_ |
| OLD | NEW |