| Index: components/mus/surfaces/top_level_display_client.h
|
| diff --git a/components/view_manager/surfaces/top_level_display_client.h b/components/mus/surfaces/top_level_display_client.h
|
| similarity index 80%
|
| rename from components/view_manager/surfaces/top_level_display_client.h
|
| rename to components/mus/surfaces/top_level_display_client.h
|
| index 475c70995a92693c6d62090f0ac8e37d86495443..f8e15ad63e920ad4e1ba9046821b5329c3d9858b 100644
|
| --- a/components/view_manager/surfaces/top_level_display_client.h
|
| +++ b/components/mus/surfaces/top_level_display_client.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_VIEW_MANAGER_SURFACES_DISPLAY_IMPL_H_
|
| -#define COMPONENTS_VIEW_MANAGER_SURFACES_DISPLAY_IMPL_H_
|
| +#ifndef COMPONENTS_MUS_SURFACES_DISPLAY_IMPL_H_
|
| +#define COMPONENTS_MUS_SURFACES_DISPLAY_IMPL_H_
|
|
|
| #include "base/memory/scoped_ptr.h"
|
| #include "cc/surfaces/display_client.h"
|
| #include "cc/surfaces/surface_factory.h"
|
| #include "cc/surfaces/surface_factory_client.h"
|
| -#include "components/view_manager/surfaces/surfaces_context_provider.h"
|
| -#include "components/view_manager/surfaces/surfaces_context_provider_delegate.h"
|
| -#include "components/view_manager/surfaces/surfaces_state.h"
|
| +#include "components/mus/surfaces/surfaces_context_provider.h"
|
| +#include "components/mus/surfaces/surfaces_context_provider_delegate.h"
|
| +#include "components/mus/surfaces/surfaces_state.h"
|
| #include "third_party/mojo/src/mojo/public/cpp/bindings/strong_binding.h"
|
| #include "ui/gfx/native_widget_types.h"
|
|
|
| @@ -33,10 +33,9 @@ class SurfacesState;
|
| // A TopLevelDisplayClient manages the top level surface that is rendered into a
|
| // provided AcceleratedWidget. Frames are submitted here. New frames are
|
| // scheduled to be generated here based on VSync.
|
| -class TopLevelDisplayClient
|
| - : public cc::DisplayClient,
|
| - public cc::SurfaceFactoryClient,
|
| - public surfaces::SurfacesContextProviderDelegate {
|
| +class TopLevelDisplayClient : public cc::DisplayClient,
|
| + public cc::SurfaceFactoryClient,
|
| + public surfaces::SurfacesContextProviderDelegate {
|
| public:
|
| TopLevelDisplayClient(gfx::AcceleratedWidget widget,
|
| const scoped_refptr<gles2::GpuState>& gpu_state,
|
| @@ -76,4 +75,4 @@ class TopLevelDisplayClient
|
|
|
| } // namespace surfaces
|
|
|
| -#endif // COMPONENTS_VIEW_MANAGER_SURFACES_DISPLAY_IMPL_H_
|
| +#endif // COMPONENTS_MUS_SURFACES_DISPLAY_IMPL_H_
|
|
|