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

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

Issue 2768343002: Change namespace from ui to gfx for NativePixmap related code (Closed)
Patch Set: Addressed sadrul's remark Created 3 years, 9 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 | « media/gpu/video_decode_accelerator_unittest.cc ('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 163 matching lines...) Expand 10 before | Expand all | Expand 10 after
174 PendingRequests pending_requests_; 174 PendingRequests pending_requests_;
175 175
176 UserIdToUserState user_id_to_user_state_; 176 UserIdToUserState user_id_to_user_state_;
177 177
178 // Provides input-device information via Mojo IPC. Registers Mojo interfaces 178 // Provides input-device information via Mojo IPC. Registers Mojo interfaces
179 // and must outlive service_manager::InterfaceRegistry. 179 // and must outlive service_manager::InterfaceRegistry.
180 InputDeviceServer input_device_server_; 180 InputDeviceServer input_device_server_;
181 181
182 bool test_config_; 182 bool test_config_;
183 #if defined(USE_OZONE) 183 #if defined(USE_OZONE)
184 std::unique_ptr<ui::ClientNativePixmapFactory> client_native_pixmap_factory_; 184 std::unique_ptr<gfx::ClientNativePixmapFactory> client_native_pixmap_factory_;
185 #endif 185 #endif
186 186
187 // Manages display hardware and handles display management. May register Mojo 187 // Manages display hardware and handles display management. May register Mojo
188 // interfaces and must outlive service_manager::InterfaceRegistry. 188 // interfaces and must outlive service_manager::InterfaceRegistry.
189 std::unique_ptr<display::ScreenManager> screen_manager_; 189 std::unique_ptr<display::ScreenManager> screen_manager_;
190 190
191 IMERegistrarImpl ime_registrar_; 191 IMERegistrarImpl ime_registrar_;
192 IMEServerImpl ime_server_; 192 IMEServerImpl ime_server_;
193 193
194 std::unique_ptr<discardable_memory::DiscardableSharedMemoryManager> 194 std::unique_ptr<discardable_memory::DiscardableSharedMemoryManager>
195 discardable_shared_memory_manager_; 195 discardable_shared_memory_manager_;
196 196
197 DISALLOW_COPY_AND_ASSIGN(Service); 197 DISALLOW_COPY_AND_ASSIGN(Service);
198 }; 198 };
199 199
200 } // namespace ui 200 } // namespace ui
201 201
202 #endif // SERVICES_UI_SERVICE_H_ 202 #endif // SERVICES_UI_SERVICE_H_
OLDNEW
« no previous file with comments | « media/gpu/video_decode_accelerator_unittest.cc ('k') | services/ui/service.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698