Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(208)

Side by Side Diff: services/ui/service.h

Issue 2323393003: Connect mojom::DisplayController from ash to ui. (Closed)
Patch Set: Add comments. Created 4 years, 3 months ago
Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.
Jump to:
View unified diff | Download patch
« no previous file with comments | « services/ui/public/interfaces/display/display_controller.mojom ('k') | services/ui/service.cc » ('j') | no next file with comments »
Toggle Intra-line Diffs ('i') | Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
OLDNEW
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 149 matching lines...) Expand 10 before | Expand all | Expand 10 after
160 mojom::WindowServerTestRequest request) override; 160 mojom::WindowServerTestRequest request) override;
161 161
162 std::unique_ptr<ws::WindowServer> window_server_; 162 std::unique_ptr<ws::WindowServer> window_server_;
163 std::unique_ptr<ui::PlatformEventSource> event_source_; 163 std::unique_ptr<ui::PlatformEventSource> event_source_;
164 tracing::Provider tracing_; 164 tracing::Provider tracing_;
165 using PendingRequests = std::vector<std::unique_ptr<PendingRequest>>; 165 using PendingRequests = std::vector<std::unique_ptr<PendingRequest>>;
166 PendingRequests pending_requests_; 166 PendingRequests pending_requests_;
167 167
168 UserIdToUserState user_id_to_user_state_; 168 UserIdToUserState user_id_to_user_state_;
169 169
170 // Provides input-device information via Mojo IPC. 170 // Provides input-device information via Mojo IPC. Registers Mojo interfaces
171 // and must outlive shell::InterfaceRegistry.
171 InputDeviceServer input_device_server_; 172 InputDeviceServer input_device_server_;
172 173
173 bool test_config_; 174 bool test_config_;
174 #if defined(USE_OZONE) 175 #if defined(USE_OZONE)
175 std::unique_ptr<ui::ClientNativePixmapFactory> client_native_pixmap_factory_; 176 std::unique_ptr<ui::ClientNativePixmapFactory> client_native_pixmap_factory_;
176 #endif 177 #endif
177 178
179 // Manages display hardware and handles display management. May register Mojo
180 // interfaces and must outlive shell::InterfaceRegistry.
178 std::unique_ptr<display::PlatformScreen> platform_screen_; 181 std::unique_ptr<display::PlatformScreen> platform_screen_;
182
179 std::unique_ptr<ws::TouchController> touch_controller_; 183 std::unique_ptr<ws::TouchController> touch_controller_;
180 IMERegistrarImpl ime_registrar_; 184 IMERegistrarImpl ime_registrar_;
181 IMEServerImpl ime_server_; 185 IMEServerImpl ime_server_;
182 186
183 DISALLOW_COPY_AND_ASSIGN(Service); 187 DISALLOW_COPY_AND_ASSIGN(Service);
184 }; 188 };
185 189
186 } // namespace ui 190 } // namespace ui
187 191
188 #endif // SERVICES_UI_SERVICE_H_ 192 #endif // SERVICES_UI_SERVICE_H_
OLDNEW
« no previous file with comments | « services/ui/public/interfaces/display/display_controller.mojom ('k') | services/ui/service.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698