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

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

Issue 2549503002: Rename PlatformScreen to ScreenManager. (Closed)
Patch Set: Rebase. Created 4 years 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/display/screen_manager_stub.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 23 matching lines...) Expand all
34 #include "services/ui/ws/platform_display_init_params.h" 34 #include "services/ui/ws/platform_display_init_params.h"
35 #include "services/ui/ws/touch_controller.h" 35 #include "services/ui/ws/touch_controller.h"
36 #include "services/ui/ws/user_id.h" 36 #include "services/ui/ws/user_id.h"
37 #include "services/ui/ws/window_server_delegate.h" 37 #include "services/ui/ws/window_server_delegate.h"
38 38
39 #if defined(USE_OZONE) 39 #if defined(USE_OZONE)
40 #include "ui/ozone/public/client_native_pixmap_factory.h" 40 #include "ui/ozone/public/client_native_pixmap_factory.h"
41 #endif 41 #endif
42 42
43 namespace display { 43 namespace display {
44 class PlatformScreen; 44 class ScreenManager;
45 } 45 }
46 46
47 namespace gfx { 47 namespace gfx {
48 class Rect; 48 class Rect;
49 } 49 }
50 50
51 namespace service_manager { 51 namespace service_manager {
52 class Connector; 52 class Connector;
53 } 53 }
54 54
(...skipping 119 matching lines...) Expand 10 before | Expand all | Expand 10 after
174 // and must outlive service_manager::InterfaceRegistry. 174 // and must outlive service_manager::InterfaceRegistry.
175 InputDeviceServer input_device_server_; 175 InputDeviceServer input_device_server_;
176 176
177 bool test_config_; 177 bool test_config_;
178 #if defined(USE_OZONE) 178 #if defined(USE_OZONE)
179 std::unique_ptr<ui::ClientNativePixmapFactory> client_native_pixmap_factory_; 179 std::unique_ptr<ui::ClientNativePixmapFactory> client_native_pixmap_factory_;
180 #endif 180 #endif
181 181
182 // Manages display hardware and handles display management. May register Mojo 182 // Manages display hardware and handles display management. May register Mojo
183 // interfaces and must outlive service_manager::InterfaceRegistry. 183 // interfaces and must outlive service_manager::InterfaceRegistry.
184 std::unique_ptr<display::PlatformScreen> platform_screen_; 184 std::unique_ptr<display::ScreenManager> screen_manager_;
185 185
186 std::unique_ptr<ws::TouchController> touch_controller_; 186 std::unique_ptr<ws::TouchController> touch_controller_;
187 IMERegistrarImpl ime_registrar_; 187 IMERegistrarImpl ime_registrar_;
188 IMEServerImpl ime_server_; 188 IMEServerImpl ime_server_;
189 189
190 DISALLOW_COPY_AND_ASSIGN(Service); 190 DISALLOW_COPY_AND_ASSIGN(Service);
191 }; 191 };
192 192
193 } // namespace ui 193 } // namespace ui
194 194
195 #endif // SERVICES_UI_SERVICE_H_ 195 #endif // SERVICES_UI_SERVICE_H_
OLDNEW
« no previous file with comments | « services/ui/display/screen_manager_stub.cc ('k') | services/ui/service.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698