components/mus/public/interfaces View => Window

components/mus/mus_app.h

 // Copyright 2014 The Chromium Authors. All rights reserved.
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
 #ifndef COMPONENTS_MUS_VIEW_MANAGER_APP_H_
 #define COMPONENTS_MUS_VIEW_MANAGER_APP_H_
 
 #include <set>
 
 #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"
 #include "mojo/application/public/cpp/interface_factory.h"
 #include "mojo/common/tracing_impl.h"
 #include "mojo/common/weak_binding_set.h"
 
 namespace mojo {
 class ApplicationImpl;
 }
 
 namespace ui {
 class PlatformEventSource;
 }
 
 namespace mus {
 
 class ConnectionManager;
 class GpuState;
 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;
 
  private:
   // ApplicationDelegate:
   void Initialize(mojo::ApplicationImpl* app) override;
   bool ConfigureIncomingConnection(
       mojo::ApplicationConnection* connection) override;
 
   // ConnectionManagerDelegate:
   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_;
   scoped_refptr<GpuState> gpu_state_;
   scoped_ptr<ui::PlatformEventSource> event_source_;
 
   // Surfaces
   scoped_refptr<SurfacesState> surfaces_state_;
 
   DISALLOW_COPY_AND_ASSIGN(MandolineUIServicesApp);
 };
 
 }  // namespace mus
 
 #endif  // COMPONENTS_MUS_VIEW_MANAGER_APP_H_