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

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

Issue 2705333006: Move client_native_pixmap_factory.h from ui/ozone/public to ui/gfx (Closed)
Patch Set: Rebase 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
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 18 matching lines...) Expand all
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/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(OS_LINUX)
40 #include "ui/ozone/public/client_native_pixmap_factory.h" 40 #include "ui/gfx/client_native_pixmap_factory.h"
41 #endif 41 #endif
42 42
43 namespace discardable_memory { 43 namespace discardable_memory {
44 class DiscardableSharedMemoryManager; 44 class DiscardableSharedMemoryManager;
45 } 45 }
46 46
47 namespace display { 47 namespace display {
48 class ScreenManager; 48 class ScreenManager;
49 } 49 }
50 50
(...skipping 143 matching lines...) Expand 10 before | Expand all | Expand 10 after
194 194
195 std::unique_ptr<discardable_memory::DiscardableSharedMemoryManager> 195 std::unique_ptr<discardable_memory::DiscardableSharedMemoryManager>
196 discardable_shared_memory_manager_; 196 discardable_shared_memory_manager_;
197 197
198 DISALLOW_COPY_AND_ASSIGN(Service); 198 DISALLOW_COPY_AND_ASSIGN(Service);
199 }; 199 };
200 200
201 } // namespace ui 201 } // namespace ui
202 202
203 #endif // SERVICES_UI_SERVICE_H_ 203 #endif // SERVICES_UI_SERVICE_H_
OLDNEW
« no previous file with comments | « services/ui/BUILD.gn ('k') | ui/gfx/BUILD.gn » ('j') | ui/gfx/client_native_pixmap.h » ('J')

Powered by Google App Engine
This is Rietveld 408576698