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

Side by Side Diff: services/ui/surfaces/display_compositor.h

Issue 2119963002: Move mus to //services/ui (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
OLDNEW
1 // Copyright 2016 The Chromium Authors. All rights reserved. 1 // Copyright 2016 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 COMPONENTS_MUS_SURFACES_DISPLAY_COMPOSITOR_H_ 5 #ifndef SERVICES_UI_SURFACES_DISPLAY_COMPOSITOR_H_
6 #define COMPONENTS_MUS_SURFACES_DISPLAY_COMPOSITOR_H_ 6 #define SERVICES_UI_SURFACES_DISPLAY_COMPOSITOR_H_
7 7
8 #include "cc/surfaces/display_client.h" 8 #include "cc/surfaces/display_client.h"
9 #include "cc/surfaces/surface.h" 9 #include "cc/surfaces/surface.h"
10 #include "cc/surfaces/surface_factory.h" 10 #include "cc/surfaces/surface_factory.h"
11 #include "cc/surfaces/surface_factory_client.h" 11 #include "cc/surfaces/surface_factory_client.h"
12 #include "cc/surfaces/surface_id_allocator.h" 12 #include "cc/surfaces/surface_id_allocator.h"
13 #include "components/mus/gles2/gpu_state.h" 13 #include "services/ui/gles2/gpu_state.h"
14 #include "components/mus/surfaces/surfaces_state.h" 14 #include "services/ui/surfaces/surfaces_state.h"
15 #include "ui/gfx/native_widget_types.h" 15 #include "ui/gfx/native_widget_types.h"
16 16
17 namespace cc { 17 namespace cc {
18 class Display; 18 class Display;
19 } 19 }
20 20
21 namespace mus { 21 namespace mus {
22 22
23 // TODO(fsamuel): This should become a mojo interface for the mus-gpu split. 23 // TODO(fsamuel): This should become a mojo interface for the mus-gpu split.
24 // TODO(fsamuel): This should not be a SurfaceFactoryClient. 24 // TODO(fsamuel): This should not be a SurfaceFactoryClient.
(...skipping 45 matching lines...) Expand 10 before | Expand all | Expand 10 after
70 cc::SurfaceIdAllocator allocator_; 70 cc::SurfaceIdAllocator allocator_;
71 cc::SurfaceId surface_id_; 71 cc::SurfaceId surface_id_;
72 72
73 gfx::Size display_size_; 73 gfx::Size display_size_;
74 std::unique_ptr<cc::Display> display_; 74 std::unique_ptr<cc::Display> display_;
75 DISALLOW_COPY_AND_ASSIGN(DisplayCompositor); 75 DISALLOW_COPY_AND_ASSIGN(DisplayCompositor);
76 }; 76 };
77 77
78 } // namespace mus 78 } // namespace mus
79 79
80 #endif // COMPONENTS_MUS_SURFACES_DISPLAY_COMPOSITOR_H_ 80 #endif // SERVICES_UI_SURFACES_DISPLAY_COMPOSITOR_H_
OLDNEW
« no previous file with comments | « services/ui/surfaces/direct_output_surface_ozone.cc ('k') | services/ui/surfaces/display_compositor.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698