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

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

Issue 2589253002: Remove discardable_memory::DSMM::{Create,Get}Instance() (Closed)
Patch Set: Fix trybot Created 3 years, 12 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
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/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" 36 #include "services/ui/ws/touch_controller.h"
37 #include "services/ui/ws/user_id.h" 37 #include "services/ui/ws/user_id.h"
38 #include "services/ui/ws/window_server_delegate.h" 38 #include "services/ui/ws/window_server_delegate.h"
39 39
40 #if defined(USE_OZONE) 40 #if defined(USE_OZONE)
41 #include "ui/ozone/public/client_native_pixmap_factory.h" 41 #include "ui/ozone/public/client_native_pixmap_factory.h"
42 #endif 42 #endif
43 43
44 namespace discardable_memory {
45 class DiscardableSharedMemoryManager;
46 }
47
44 namespace display { 48 namespace display {
45 class ScreenManager; 49 class ScreenManager;
46 } 50 }
47 51
48 namespace service_manager { 52 namespace service_manager {
49 class Connector; 53 class Connector;
50 } 54 }
51 55
52 namespace ui { 56 namespace ui {
53 57
(...skipping 130 matching lines...) Expand 10 before | Expand all | Expand 10 after
184 #endif 188 #endif
185 189
186 // Manages display hardware and handles display management. May register Mojo 190 // Manages display hardware and handles display management. May register Mojo
187 // interfaces and must outlive service_manager::InterfaceRegistry. 191 // interfaces and must outlive service_manager::InterfaceRegistry.
188 std::unique_ptr<display::ScreenManager> screen_manager_; 192 std::unique_ptr<display::ScreenManager> screen_manager_;
189 193
190 std::unique_ptr<ws::TouchController> touch_controller_; 194 std::unique_ptr<ws::TouchController> touch_controller_;
191 IMERegistrarImpl ime_registrar_; 195 IMERegistrarImpl ime_registrar_;
192 IMEServerImpl ime_server_; 196 IMEServerImpl ime_server_;
193 197
198 std::unique_ptr<discardable_memory::DiscardableSharedMemoryManager>
199 discardable_shared_memory_manager_;
200
194 DISALLOW_COPY_AND_ASSIGN(Service); 201 DISALLOW_COPY_AND_ASSIGN(Service);
195 }; 202 };
196 203
197 } // namespace ui 204 } // namespace ui
198 205
199 #endif // SERVICES_UI_SERVICE_H_ 206 #endif // SERVICES_UI_SERVICE_H_
OLDNEW
« no previous file with comments | « content/renderer/render_thread_impl_discardable_memory_browsertest.cc ('k') | services/ui/service.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698