Index: components/mus/server_view.h |
diff --git a/components/view_manager/server_view.h b/components/mus/server_view.h |
similarity index 96% |
rename from components/view_manager/server_view.h |
rename to components/mus/server_view.h |
index 40688f7976e6deeca9864c4f70f9ea922b70de78..706acdd6dc5f4f88aeec2cb509dddab8f0a229fc 100644 |
--- a/components/view_manager/server_view.h |
+++ b/components/mus/server_view.h |
@@ -13,8 +13,8 @@ |
#include "cc/surfaces/surface_factory_client.h" |
#include "cc/surfaces/surface_id.h" |
#include "cc/surfaces/surface_id_allocator.h" |
-#include "components/view_manager/ids.h" |
-#include "components/view_manager/public/interfaces/view_tree.mojom.h" |
+#include "components/mus/ids.h" |
+#include "components/mus/public/interfaces/view_tree.mojom.h" |
#include "third_party/mojo/src/mojo/public/cpp/bindings/binding.h" |
#include "ui/gfx/geometry/rect.h" |
#include "ui/gfx/transform.h" |
@@ -35,8 +35,7 @@ class ServerViewObserver; |
// ServerViews do not own their children. If you delete a view that has children |
// the children are implicitly removed. Similarly if a view has a parent and the |
// view is deleted the deleted view is implicitly removed from the parent. |
-class ServerView : public mojo::Surface, |
- public cc::SurfaceFactoryClient { |
+class ServerView : public mojo::Surface, public cc::SurfaceFactoryClient { |
public: |
ServerView(ServerViewDelegate* delegate, const ViewId& id); |
~ServerView() override; |