| Index: services/ui/surfaces/display_compositor.h
|
| diff --git a/components/mus/surfaces/display_compositor.h b/services/ui/surfaces/display_compositor.h
|
| similarity index 91%
|
| rename from components/mus/surfaces/display_compositor.h
|
| rename to services/ui/surfaces/display_compositor.h
|
| index 27d1eebf3cfd285519d6be250394878291016224..b03da551d3a155c50bfab08642f23e8dcfe7e683 100644
|
| --- a/components/mus/surfaces/display_compositor.h
|
| +++ b/services/ui/surfaces/display_compositor.h
|
| @@ -2,16 +2,16 @@
|
| // Use of this source code is governed by a BSD-style license that can be
|
| // found in the LICENSE file.
|
|
|
| -#ifndef COMPONENTS_MUS_SURFACES_DISPLAY_COMPOSITOR_H_
|
| -#define COMPONENTS_MUS_SURFACES_DISPLAY_COMPOSITOR_H_
|
| +#ifndef SERVICES_UI_SURFACES_DISPLAY_COMPOSITOR_H_
|
| +#define SERVICES_UI_SURFACES_DISPLAY_COMPOSITOR_H_
|
|
|
| #include "cc/surfaces/display_client.h"
|
| #include "cc/surfaces/surface.h"
|
| #include "cc/surfaces/surface_factory.h"
|
| #include "cc/surfaces/surface_factory_client.h"
|
| #include "cc/surfaces/surface_id_allocator.h"
|
| -#include "components/mus/gles2/gpu_state.h"
|
| -#include "components/mus/surfaces/surfaces_state.h"
|
| +#include "services/ui/gles2/gpu_state.h"
|
| +#include "services/ui/surfaces/surfaces_state.h"
|
| #include "ui/gfx/native_widget_types.h"
|
|
|
| namespace cc {
|
| @@ -77,4 +77,4 @@ class DisplayCompositor : public cc::SurfaceFactoryClient,
|
|
|
| } // namespace mus
|
|
|
| -#endif // COMPONENTS_MUS_SURFACES_DISPLAY_COMPOSITOR_H_
|
| +#endif // SERVICES_UI_SURFACES_DISPLAY_COMPOSITOR_H_
|
|
|