components/mus/public/interfaces View => Window

components/mus/mus_app.cc

 // 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.
 
 #include "components/mus/mus_app.h"
 
 #include "base/stl_util.h"
 #include "components/mus/gles2/gpu_impl.h"
 #include "components/mus/public/cpp/args.h"
 #include "components/mus/surfaces/surfaces_scheduler.h"
@@ skipping 12 matching lines @@
 #include "ui/gl/gl_surface.h"
 
 #if defined(USE_X11)
 #include <X11/Xlib.h>
 #include "base/command_line.h"
 #include "ui/platform_window/x11/x11_window.h"
 #endif
 
 using mojo::ApplicationConnection;
 using mojo::ApplicationImpl;
-using mojo::Gpu;
 using mojo::InterfaceRequest;
-using mojo::ViewTreeHostFactory;
+using mus::mojom::WindowTreeHostFactory;
+using mus::mojom::Gpu;
 
 namespace mus {
 
 MandolineUIServicesApp::MandolineUIServicesApp()
     : app_impl_(nullptr) {}
 
 MandolineUIServicesApp::~MandolineUIServicesApp() {
   if (gpu_state_)
     gpu_state_->StopControlThread();
   // Destroy |connection_manager_| first, since it depends on |event_source_|.
@@ skipping 18 matching lines @@
   event_source_ = ui::PlatformEventSource::CreateDefault();
 #endif
 
   if (!gpu_state_.get())
     gpu_state_ = new GpuState;
   connection_manager_.reset(new ConnectionManager(this, surfaces_state_));
 }
 
 bool MandolineUIServicesApp::ConfigureIncomingConnection(
     ApplicationConnection* connection) {
-  connection->AddService<ViewTreeHostFactory>(this);
+  connection->AddService<WindowTreeHostFactory>(this);
   connection->AddService<Gpu>(this);
   return true;
 }
 
 void MandolineUIServicesApp::OnNoMoreRootConnections() {
   app_impl_->Quit();
 }
 
 ClientConnection* MandolineUIServicesApp::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) {
-  mojo::ViewTreeClientPtr client;
+  mojom::WindowTreeClientPtr client;
   app_impl_->ConnectToService(request.Pass(), &client);
 
   scoped_ptr<ViewTreeImpl> service(new ViewTreeImpl(
       connection_manager, creator_id, root_id, policy_bitmask));
   return new DefaultClientConnection(service.Pass(), connection_manager,
                                      tree_request.Pass(), client.Pass());
 }
 
 ClientConnection* MandolineUIServicesApp::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) {
+    mojom::WindowTreeClientPtr client) {
   scoped_ptr<ViewTreeImpl> service(new ViewTreeImpl(
       connection_manager, creator_id, root_id, policy_bitmask));
   return new DefaultClientConnection(service.Pass(), connection_manager,
                                      tree_request.Pass(), client.Pass());
 }
 
 void MandolineUIServicesApp::Create(
     ApplicationConnection* connection,
-    InterfaceRequest<ViewTreeHostFactory> request) {
+    InterfaceRequest<WindowTreeHostFactory> request) {
   factory_bindings_.AddBinding(this, request.Pass());
 }
 
 void MandolineUIServicesApp::Create(mojo::ApplicationConnection* connection,
                                     mojo::InterfaceRequest<Gpu> request) {
   if (!gpu_state_.get())
     gpu_state_ = new GpuState;
   new GpuImpl(request.Pass(), gpu_state_);
 }
 
 void MandolineUIServicesApp::CreateWindowTreeHost(
-    mojo::InterfaceRequest<mojo::ViewTreeHost> host,
-    mojo::ViewTreeHostClientPtr host_client,
-    mojo::ViewTreeClientPtr tree_client) {
+    mojo::InterfaceRequest<mojom::WindowTreeHost> host,
+    mojom::WindowTreeHostClientPtr host_client,
+    mojom::WindowTreeClientPtr tree_client) {
   DCHECK(connection_manager_.get());
 
   // TODO(fsamuel): We need to make sure that only the window manager can create
   // new roots.
   ViewTreeHostImpl* host_impl = new ViewTreeHostImpl(
       host_client.Pass(), connection_manager_.get(), app_impl_,
       gpu_state_, surfaces_state_);
 
   // ViewTreeHostConnection manages its own lifetime.
   host_impl->Init(new ViewTreeHostConnectionImpl(
       host.Pass(), make_scoped_ptr(host_impl), tree_client.Pass(),
       connection_manager_.get()));
 }
 
 }  // namespace mus