| Index: components/mus/view_tree_host_impl.h
|
| diff --git a/components/view_manager/view_tree_host_impl.h b/components/mus/view_tree_host_impl.h
|
| similarity index 87%
|
| rename from components/view_manager/view_tree_host_impl.h
|
| rename to components/mus/view_tree_host_impl.h
|
| index ce264af79e9ab9260c5a15e2fa8e0db384038735..2ce45c8f00728231b2f6f85cc0db28a224772864 100644
|
| --- a/components/view_manager/view_tree_host_impl.h
|
| +++ b/components/mus/view_tree_host_impl.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_VIEW_TREE_HOST_IMPL_H_
|
| -#define COMPONENTS_VIEW_MANAGER_VIEW_TREE_HOST_IMPL_H_
|
| +#ifndef COMPONENTS_MUS_VIEW_TREE_HOST_IMPL_H_
|
| +#define COMPONENTS_MUS_VIEW_TREE_HOST_IMPL_H_
|
|
|
| #include "base/memory/scoped_ptr.h"
|
| -#include "components/view_manager/display_manager.h"
|
| -#include "components/view_manager/event_dispatcher.h"
|
| -#include "components/view_manager/focus_controller_delegate.h"
|
| -#include "components/view_manager/public/cpp/types.h"
|
| -#include "components/view_manager/public/interfaces/view_tree_host.mojom.h"
|
| -#include "components/view_manager/server_view.h"
|
| +#include "components/mus/display_manager.h"
|
| +#include "components/mus/event_dispatcher.h"
|
| +#include "components/mus/focus_controller_delegate.h"
|
| +#include "components/mus/public/cpp/types.h"
|
| +#include "components/mus/public/interfaces/view_tree_host.mojom.h"
|
| +#include "components/mus/server_view.h"
|
|
|
| namespace cc {
|
| class SurfaceManager;
|
| @@ -40,14 +40,14 @@ class ViewTreeHostImpl : public DisplayManagerDelegate,
|
| // TODO(fsamuel): All these parameters are just plumbing for creating
|
| // DisplayManagers. We should probably just store these common parameters
|
| // in the DisplayManagerFactory and pass them along on DisplayManager::Create.
|
| - ViewTreeHostImpl(
|
| + ViewTreeHostImpl(
|
| mojo::ViewTreeHostClientPtr client,
|
| ConnectionManager* connection_manager,
|
| bool is_headless,
|
| mojo::ApplicationImpl* app_impl,
|
| const scoped_refptr<gles2::GpuState>& gpu_state,
|
| const scoped_refptr<surfaces::SurfacesState>& surfaces_state);
|
| - ~ViewTreeHostImpl() override;
|
| + ~ViewTreeHostImpl() override;
|
|
|
| // Initializes state that depends on the existence of a ViewTreeHostImpl.
|
| void Init(ViewTreeHostDelegate* delegate);
|
| @@ -120,4 +120,4 @@ class ViewTreeHostImpl : public DisplayManagerDelegate,
|
|
|
| } // namespace view_manager
|
|
|
| -#endif // COMPONENTS_VIEW_MANAGER_VIEW_TREE_HOST_IMPL_H_
|
| +#endif // COMPONENTS_MUS_VIEW_TREE_HOST_IMPL_H_
|
|
|