components/mus/public/interfaces View => Window

components/mus/mus_app.h

Index: components/mus/mus_app.h
diff --git a/components/mus/mus_app.h b/components/mus/mus_app.h
index 9ffd4375cd9b43f459bf5fd40ef629f22078aab3..78aa444b9339124e5f6b81e2b1d906a448a86bb1 100644
--- a/components/mus/mus_app.h
+++ b/components/mus/mus_app.h
@@ -9,8 +9,8 @@
 
 #include "base/memory/scoped_ptr.h"
 #include "components/mus/public/interfaces/gpu.mojom.h"
-#include "components/mus/public/interfaces/view_tree.mojom.h"
-#include "components/mus/public/interfaces/view_tree_host.mojom.h"
+#include "components/mus/public/interfaces/window_tree.mojom.h"
+#include "components/mus/public/interfaces/window_tree_host.mojom.h"
 #include "components/mus/ws/connection_manager_delegate.h"
 #include "mojo/application/public/cpp/app_lifetime_helper.h"
 #include "mojo/application/public/cpp/application_delegate.h"
@@ -35,9 +35,9 @@ class SurfacesState;
 class MandolineUIServicesApp
     : public mojo::ApplicationDelegate,
       public ConnectionManagerDelegate,
-      public mojo::InterfaceFactory<mojo::ViewTreeHostFactory>,
-      public mojo::InterfaceFactory<mojo::Gpu>,
-      public mojo::ViewTreeHostFactory {
+      public mojo::InterfaceFactory<mojom::WindowTreeHostFactory>,
+      public mojo::InterfaceFactory<mojom::Gpu>,
+      public mojom::WindowTreeHostFactory {
  public:
   MandolineUIServicesApp();
   ~MandolineUIServicesApp() override;
@@ -52,34 +52,34 @@ class MandolineUIServicesApp
   void OnNoMoreRootConnections() override;
   ClientConnection* CreateClientConnectionForEmbedAtView(
       ConnectionManager* connection_manager,
-      mojo::InterfaceRequest<mojo::ViewTree> tree_request,
+      mojo::InterfaceRequest<mojom::WindowTree> tree_request,
       ConnectionSpecificId creator_id,
       mojo::URLRequestPtr request,
       const ViewId& root_id,
       uint32_t policy_bitmask) override;
   ClientConnection* CreateClientConnectionForEmbedAtView(
       ConnectionManager* connection_manager,
-      mojo::InterfaceRequest<mojo::ViewTree> tree_request,
+      mojo::InterfaceRequest<mojom::WindowTree> tree_request,
       ConnectionSpecificId creator_id,
       const ViewId& root_id,
       uint32_t policy_bitmask,
-      mojo::ViewTreeClientPtr client) override;
+      mojom::WindowTreeClientPtr client) override;
 
-  // mojo::InterfaceFactory<mojo::ViewTreeHostFactory>:
+  // mojo::InterfaceFactory<mojom::WindowTreeHostFactory>:
   void Create(
       mojo::ApplicationConnection* connection,
-      mojo::InterfaceRequest<mojo::ViewTreeHostFactory> request) override;
+      mojo::InterfaceRequest<mojom::WindowTreeHostFactory> request) override;
 
-  // mojo::InterfaceFactory<mojo::Gpu> implementation.
+  // mojo::InterfaceFactory<mojom::Gpu> implementation.
   void Create(mojo::ApplicationConnection* connection,
-              mojo::InterfaceRequest<mojo::Gpu> request) override;
+              mojo::InterfaceRequest<mojom::Gpu> request) override;
 
-  // mojo::ViewTreeHostFactory implementation.
-  void CreateWindowTreeHost(mojo::InterfaceRequest<mojo::ViewTreeHost> host,
-                            mojo::ViewTreeHostClientPtr host_client,
-                            mojo::ViewTreeClientPtr tree_client) override;
+  // mojom::WindowTreeHostFactory implementation.
+  void CreateWindowTreeHost(mojo::InterfaceRequest<mojom::WindowTreeHost> host,
+                            mojom::WindowTreeHostClientPtr host_client,
+                            mojom::WindowTreeClientPtr tree_client) override;
 
-  mojo::WeakBindingSet<mojo::ViewTreeHostFactory> factory_bindings_;
+  mojo::WeakBindingSet<mojom::WindowTreeHostFactory> factory_bindings_;
   mojo::ApplicationImpl* app_impl_;
   scoped_ptr<ConnectionManager> connection_manager_;
   mojo::TracingImpl tracing_;