| Index: components/mus/view_tree_host_connection.h
|
| diff --git a/components/view_manager/view_tree_host_connection.h b/components/mus/view_tree_host_connection.h
|
| similarity index 68%
|
| rename from components/view_manager/view_tree_host_connection.h
|
| rename to components/mus/view_tree_host_connection.h
|
| index 0ff96febef95d121c21f8887a6f7ebaa5761163b..44ea157b02a7eaee5d76b7e65b077e4d6e0e8d76 100644
|
| --- a/components/view_manager/view_tree_host_connection.h
|
| +++ b/components/mus/view_tree_host_connection.h
|
| @@ -2,13 +2,13 @@
|
| // 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_CONNECTION_H_
|
| -#define COMPONENTS_VIEW_MANAGER_VIEW_TREE_HOST_CONNECTION_H_
|
| +#ifndef COMPONENTS_MUS_VIEW_TREE_HOST_CONNECTION_H_
|
| +#define COMPONENTS_MUS_VIEW_TREE_HOST_CONNECTION_H_
|
|
|
| #include "base/memory/scoped_ptr.h"
|
| -#include "components/view_manager/public/interfaces/view_tree_host.mojom.h"
|
| -#include "components/view_manager/view_tree_host_delegate.h"
|
| -#include "components/view_manager/view_tree_host_impl.h"
|
| +#include "components/mus/public/interfaces/view_tree_host.mojom.h"
|
| +#include "components/mus/view_tree_host_delegate.h"
|
| +#include "components/mus/view_tree_host_impl.h"
|
| #include "third_party/mojo/src/mojo/public/cpp/bindings/binding.h"
|
|
|
| namespace view_manager {
|
| @@ -25,15 +25,12 @@ class ViewTreeImpl;
|
| // ConnectionManager to destroy the root and its associated view tree.
|
| class ViewTreeHostConnection : public ViewTreeHostDelegate {
|
| public:
|
| - ViewTreeHostConnection(
|
| - scoped_ptr<ViewTreeHostImpl> host_impl,
|
| - ConnectionManager* connection_manager);
|
| + ViewTreeHostConnection(scoped_ptr<ViewTreeHostImpl> host_impl,
|
| + ConnectionManager* connection_manager);
|
|
|
| - void set_view_tree(ViewTreeImpl* tree) {
|
| - tree_ = tree;
|
| - }
|
| + void set_view_tree(ViewTreeImpl* tree) { tree_ = tree; }
|
|
|
| - ViewTreeHostImpl* view_tree_host() { return host_.get();}
|
| + ViewTreeHostImpl* view_tree_host() { return host_.get(); }
|
| const ViewTreeHostImpl* view_tree_host() const { return host_.get(); }
|
|
|
| ConnectionManager* connection_manager() { return connection_manager_; }
|
| @@ -63,14 +60,13 @@ class ViewTreeHostConnection : public ViewTreeHostDelegate {
|
| // Live implementation of ViewTreeHostConnection.
|
| class ViewTreeHostConnectionImpl : public ViewTreeHostConnection {
|
| public:
|
| - ViewTreeHostConnectionImpl(
|
| - mojo::InterfaceRequest<mojo::ViewTreeHost> request,
|
| - scoped_ptr<ViewTreeHostImpl> host_impl,
|
| - mojo::ViewTreeClientPtr client,
|
| - ConnectionManager* connection_manager);
|
| + ViewTreeHostConnectionImpl(mojo::InterfaceRequest<mojo::ViewTreeHost> request,
|
| + scoped_ptr<ViewTreeHostImpl> host_impl,
|
| + mojo::ViewTreeClientPtr client,
|
| + ConnectionManager* connection_manager);
|
|
|
| private:
|
| - ~ViewTreeHostConnectionImpl() override;
|
| + ~ViewTreeHostConnectionImpl() override;
|
|
|
| // ViewTreeHostDelegate:
|
| void OnDisplayInitialized() override;
|
| @@ -83,4 +79,4 @@ class ViewTreeHostConnectionImpl : public ViewTreeHostConnection {
|
|
|
| } // namespace view_manager
|
|
|
| -#endif // COMPONENTS_VIEW_MANAGER_VIEW_TREE_HOST_CONNECTION_H_
|
| +#endif // COMPONENTS_MUS_VIEW_TREE_HOST_CONNECTION_H_
|
|
|