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

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

Issue 2128333002: Move PlatformSceen to services/ui/display. (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: Created 4 years, 5 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/display/platform_screen_impl_ozone.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 33 matching lines...) Expand 10 before | Expand all | Expand 10 after
44 44
45 namespace shell { 45 namespace shell {
46 class Connector; 46 class Connector;
47 } 47 }
48 48
49 namespace ui { 49 namespace ui {
50 class PlatformEventSource; 50 class PlatformEventSource;
51 } 51 }
52 52
53 namespace ui { 53 namespace ui {
54
55 namespace display {
56 class PlatformScreen;
57 }
58
54 namespace ws { 59 namespace ws {
55 class ForwardingWindowManager; 60 class ForwardingWindowManager;
56 class PlatformScreen;
57 class WindowServer; 61 class WindowServer;
58 } 62 }
59 63
60 class Service 64 class Service
61 : public shell::Service, 65 : public shell::Service,
62 public ws::WindowServerDelegate, 66 public ws::WindowServerDelegate,
63 public shell::InterfaceFactory<mojom::Clipboard>, 67 public shell::InterfaceFactory<mojom::Clipboard>,
64 public shell::InterfaceFactory<mojom::DisplayManager>, 68 public shell::InterfaceFactory<mojom::DisplayManager>,
65 public shell::InterfaceFactory<mojom::Gpu>, 69 public shell::InterfaceFactory<mojom::Gpu>,
66 public shell::InterfaceFactory<mojom::GpuService>, 70 public shell::InterfaceFactory<mojom::GpuService>,
(...skipping 95 matching lines...) Expand 10 before | Expand all | Expand 10 after
162 166
163 // Provides input-device information via Mojo IPC. 167 // Provides input-device information via Mojo IPC.
164 InputDeviceServer input_device_server_; 168 InputDeviceServer input_device_server_;
165 169
166 bool test_config_; 170 bool test_config_;
167 bool use_chrome_gpu_command_buffer_; 171 bool use_chrome_gpu_command_buffer_;
168 #if defined(USE_OZONE) 172 #if defined(USE_OZONE)
169 std::unique_ptr<ui::ClientNativePixmapFactory> client_native_pixmap_factory_; 173 std::unique_ptr<ui::ClientNativePixmapFactory> client_native_pixmap_factory_;
170 #endif 174 #endif
171 175
172 std::unique_ptr<ws::PlatformScreen> platform_screen_; 176 std::unique_ptr<display::PlatformScreen> platform_screen_;
173 std::unique_ptr<ws::TouchController> touch_controller_; 177 std::unique_ptr<ws::TouchController> touch_controller_;
174 178
175 base::WeakPtrFactory<Service> weak_ptr_factory_; 179 base::WeakPtrFactory<Service> weak_ptr_factory_;
176 180
177 DISALLOW_COPY_AND_ASSIGN(Service); 181 DISALLOW_COPY_AND_ASSIGN(Service);
178 }; 182 };
179 183
180 } // namespace ui 184 } // namespace ui
181 185
182 #endif // SERVICES_UI_SERVICE_H_ 186 #endif // SERVICES_UI_SERVICE_H_
OLDNEW
« no previous file with comments | « services/ui/display/platform_screen_impl_ozone.cc ('k') | services/ui/service.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698