| Index: components/mus/view_tree_impl.h
|
| diff --git a/components/view_manager/view_tree_impl.h b/components/mus/view_tree_impl.h
|
| similarity index 93%
|
| rename from components/view_manager/view_tree_impl.h
|
| rename to components/mus/view_tree_impl.h
|
| index 2d18b14b3b315662aa1b4df579e0be9216871f40..9efbeabea5aa23e70036f4cea5eef9ee327f7d1e 100644
|
| --- a/components/view_manager/view_tree_impl.h
|
| +++ b/components/mus/view_tree_impl.h
|
| @@ -2,8 +2,8 @@
|
| // 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_IMPL_H_
|
| -#define COMPONENTS_VIEW_MANAGER_VIEW_TREE_IMPL_H_
|
| +#ifndef COMPONENTS_MUS_VIEW_TREE_IMPL_H_
|
| +#define COMPONENTS_MUS_VIEW_TREE_IMPL_H_
|
|
|
| #include <set>
|
| #include <string>
|
| @@ -13,10 +13,10 @@
|
| #include "base/containers/hash_tables.h"
|
| #include "base/memory/ref_counted.h"
|
| #include "base/memory/scoped_ptr.h"
|
| -#include "components/view_manager/access_policy_delegate.h"
|
| -#include "components/view_manager/ids.h"
|
| -#include "components/view_manager/public/interfaces/surface_id.mojom.h"
|
| -#include "components/view_manager/public/interfaces/view_tree.mojom.h"
|
| +#include "components/mus/access_policy_delegate.h"
|
| +#include "components/mus/ids.h"
|
| +#include "components/mus/public/interfaces/surface_id.mojom.h"
|
| +#include "components/mus/public/interfaces/view_tree.mojom.h"
|
|
|
| namespace gfx {
|
| class Rect;
|
| @@ -35,10 +35,10 @@ class ViewTreeHostImpl;
|
| // as necessary.
|
| class ViewTreeImpl : public mojo::ViewTree, public AccessPolicyDelegate {
|
| public:
|
| - ViewTreeImpl(ConnectionManager* connection_manager,
|
| - mojo::ConnectionSpecificId creator_id,
|
| - const ViewId& root_id);
|
| - ~ViewTreeImpl() override;
|
| + ViewTreeImpl(ConnectionManager* connection_manager,
|
| + mojo::ConnectionSpecificId creator_id,
|
| + const ViewId& root_id);
|
| + ~ViewTreeImpl() override;
|
|
|
| // |services| and |exposed_services| are the ServiceProviders to pass to the
|
| // client via OnEmbed().
|
| @@ -195,10 +195,9 @@ class ViewTreeImpl : public mojo::ViewTree, public AccessPolicyDelegate {
|
| const mojo::String& name,
|
| mojo::Array<uint8_t> value,
|
| const mojo::Callback<void(bool)>& callback) override;
|
| - void RequestSurface(
|
| - mojo::Id view_id,
|
| - mojo::InterfaceRequest<mojo::Surface> surface,
|
| - mojo::SurfaceClientPtr client) override;
|
| + void RequestSurface(mojo::Id view_id,
|
| + mojo::InterfaceRequest<mojo::Surface> surface,
|
| + mojo::SurfaceClientPtr client) override;
|
| void Embed(mojo::Id transport_view_id,
|
| mojo::ViewTreeClientPtr client,
|
| const EmbedCallback& callback) override;
|
| @@ -249,4 +248,4 @@ class ViewTreeImpl : public mojo::ViewTree, public AccessPolicyDelegate {
|
|
|
| } // namespace view_manager
|
|
|
| -#endif // COMPONENTS_VIEW_MANAGER_VIEW_TREE_IMPL_H_
|
| +#endif // COMPONENTS_MUS_VIEW_TREE_IMPL_H_
|
|
|