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

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

Issue 2627623003: Add full touch support to mus. (Closed)
Patch Set: Fixes. Created 3 years, 11 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/screen_manager_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 15 matching lines...) Expand all
26 #include "services/ui/public/interfaces/display_manager.mojom.h" 26 #include "services/ui/public/interfaces/display_manager.mojom.h"
27 #include "services/ui/public/interfaces/gpu.mojom.h" 27 #include "services/ui/public/interfaces/gpu.mojom.h"
28 #include "services/ui/public/interfaces/ime/ime.mojom.h" 28 #include "services/ui/public/interfaces/ime/ime.mojom.h"
29 #include "services/ui/public/interfaces/user_access_manager.mojom.h" 29 #include "services/ui/public/interfaces/user_access_manager.mojom.h"
30 #include "services/ui/public/interfaces/user_activity_monitor.mojom.h" 30 #include "services/ui/public/interfaces/user_activity_monitor.mojom.h"
31 #include "services/ui/public/interfaces/window_manager_window_tree_factory.mojom .h" 31 #include "services/ui/public/interfaces/window_manager_window_tree_factory.mojom .h"
32 #include "services/ui/public/interfaces/window_server_test.mojom.h" 32 #include "services/ui/public/interfaces/window_server_test.mojom.h"
33 #include "services/ui/public/interfaces/window_tree.mojom.h" 33 #include "services/ui/public/interfaces/window_tree.mojom.h"
34 #include "services/ui/public/interfaces/window_tree_host.mojom.h" 34 #include "services/ui/public/interfaces/window_tree_host.mojom.h"
35 #include "services/ui/ws/platform_display_init_params.h" 35 #include "services/ui/ws/platform_display_init_params.h"
36 #include "services/ui/ws/touch_controller.h"
37 #include "services/ui/ws/user_id.h" 36 #include "services/ui/ws/user_id.h"
38 #include "services/ui/ws/window_server_delegate.h" 37 #include "services/ui/ws/window_server_delegate.h"
39 38
40 #if defined(USE_OZONE) 39 #if defined(USE_OZONE)
41 #include "ui/ozone/public/client_native_pixmap_factory.h" 40 #include "ui/ozone/public/client_native_pixmap_factory.h"
42 #endif 41 #endif
43 42
44 namespace discardable_memory { 43 namespace discardable_memory {
45 class DiscardableSharedMemoryManager; 44 class DiscardableSharedMemoryManager;
46 } 45 }
(...skipping 57 matching lines...) Expand 10 before | Expand all | Expand 10 after
104 // service_manager::Service: 103 // service_manager::Service:
105 void OnStart() override; 104 void OnStart() override;
106 bool OnConnect(const service_manager::ServiceInfo& remote_info, 105 bool OnConnect(const service_manager::ServiceInfo& remote_info,
107 service_manager::InterfaceRegistry* registry) override; 106 service_manager::InterfaceRegistry* registry) override;
108 107
109 // WindowServerDelegate: 108 // WindowServerDelegate:
110 void StartDisplayInit() override; 109 void StartDisplayInit() override;
111 void OnFirstDisplayReady() override; 110 void OnFirstDisplayReady() override;
112 void OnNoMoreDisplays() override; 111 void OnNoMoreDisplays() override;
113 bool IsTestConfig() const override; 112 bool IsTestConfig() const override;
114 void UpdateTouchTransforms() override;
115 113
116 // service_manager::InterfaceFactory<mojom::AccessibilityManager> 114 // service_manager::InterfaceFactory<mojom::AccessibilityManager>
117 // implementation. 115 // implementation.
118 void Create(const service_manager::Identity& remote_identity, 116 void Create(const service_manager::Identity& remote_identity,
119 mojom::AccessibilityManagerRequest request) override; 117 mojom::AccessibilityManagerRequest request) override;
120 118
121 // service_manager::InterfaceFactory<mojom::Clipboard> implementation. 119 // service_manager::InterfaceFactory<mojom::Clipboard> implementation.
122 void Create(const service_manager::Identity& remote_identity, 120 void Create(const service_manager::Identity& remote_identity,
123 mojom::ClipboardRequest request) override; 121 mojom::ClipboardRequest request) override;
124 122
(...skipping 59 matching lines...) Expand 10 before | Expand all | Expand 10 after
184 182
185 bool test_config_; 183 bool test_config_;
186 #if defined(USE_OZONE) 184 #if defined(USE_OZONE)
187 std::unique_ptr<ui::ClientNativePixmapFactory> client_native_pixmap_factory_; 185 std::unique_ptr<ui::ClientNativePixmapFactory> client_native_pixmap_factory_;
188 #endif 186 #endif
189 187
190 // Manages display hardware and handles display management. May register Mojo 188 // Manages display hardware and handles display management. May register Mojo
191 // interfaces and must outlive service_manager::InterfaceRegistry. 189 // interfaces and must outlive service_manager::InterfaceRegistry.
192 std::unique_ptr<display::ScreenManager> screen_manager_; 190 std::unique_ptr<display::ScreenManager> screen_manager_;
193 191
194 std::unique_ptr<ws::TouchController> touch_controller_;
195 IMERegistrarImpl ime_registrar_; 192 IMERegistrarImpl ime_registrar_;
196 IMEServerImpl ime_server_; 193 IMEServerImpl ime_server_;
197 194
198 std::unique_ptr<discardable_memory::DiscardableSharedMemoryManager> 195 std::unique_ptr<discardable_memory::DiscardableSharedMemoryManager>
199 discardable_shared_memory_manager_; 196 discardable_shared_memory_manager_;
200 197
201 DISALLOW_COPY_AND_ASSIGN(Service); 198 DISALLOW_COPY_AND_ASSIGN(Service);
202 }; 199 };
203 200
204 } // namespace ui 201 } // namespace ui
205 202
206 #endif // SERVICES_UI_SERVICE_H_ 203 #endif // SERVICES_UI_SERVICE_H_
OLDNEW
« no previous file with comments | « services/ui/display/screen_manager_ozone.cc ('k') | services/ui/service.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698