Adds WindowManagerManager to mus

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_MUS_APP_H_
 #define COMPONENTS_MUS_MUS_APP_H_
 
 #include <stdint.h>
 
 #include <string>
@@ skipping 54 matching lines @@
   // mojo::ShellClient:
   void Initialize(mojo::Connector* connector, const std::string& url,
                   uint32_t id, uint32_t user_id) override;
   bool AcceptConnection(mojo::Connection* connection) override;
 
   // ConnectionManagerDelegate:
   void OnFirstRootConnectionCreated() override;
   void OnNoMoreRootConnections() override;
   ws::ClientConnection* CreateClientConnectionForEmbedAtWindow(
       ws::ConnectionManager* connection_manager,
-      mojo::InterfaceRequest<mojom::WindowTree> tree_request,
+      mojom::WindowTreeRequest tree_request,
       ws::ServerWindow* root,
       uint32_t policy_bitmask,
       mojom::WindowTreeClientPtr client) override;
+  ws::ClientConnection* CreateClientConnectionForWindowManager(
+      ws::WindowTreeHostImpl* tree_host,
+      ws::ServerWindow* root,
+      const mojom::Display& display,
+      uint32_t user_id,
+      mojom::WindowManagerFactory* factory) override;
+  void CreateDefaultWindowTreeHosts() override;
 
   // mojo::InterfaceFactory<mojom::DisplayManager> implementation.
   void Create(mojo::Connection* connection,
-              mojo::InterfaceRequest<mojom::DisplayManager> request) override;
+              mojom::DisplayManagerRequest request) override;
 
   // mojo::InterfaceFactory<mojom::WindowManagerFactoryService> implementation.
   void Create(mojo::Connection* connection,
-              mojo::InterfaceRequest<mojom::WindowManagerFactoryService>
-                  request) override;
+              mojom::WindowManagerFactoryServiceRequest request) override;
 
   // mojo::InterfaceFactory<mojom::WindowTreeFactory>:
-  void Create(
-      mojo::Connection* connection,
-      mojo::InterfaceRequest<mojom::WindowTreeFactory> request) override;
+  void Create(mojo::Connection* connection,
+              mojom::WindowTreeFactoryRequest request) override;
 
   // mojo::InterfaceFactory<mojom::WindowTreeHostFactory>:
-  void Create(
-      mojo::Connection* connection,
-      mojo::InterfaceRequest<mojom::WindowTreeHostFactory> request) override;
+  void Create(mojo::Connection* connection,
+              mojom::WindowTreeHostFactoryRequest request) override;
 
   // mojo::InterfaceFactory<mojom::Gpu> implementation.
-  void Create(mojo::Connection* connection,
-              mojo::InterfaceRequest<mojom::Gpu> request) override;
+  void Create(mojo::Connection* connection, mojom::GpuRequest request) override;
 
   // mojom::WindowTreeHostFactory implementation.
-  void CreateWindowTreeHost(mojo::InterfaceRequest<mojom::WindowTreeHost> host,
+  void CreateWindowTreeHost(mojom::WindowTreeHostRequest host,
                             mojom::WindowTreeClientPtr tree_client) override;
 
   mojo::BindingSet<mojom::WindowTreeHostFactory> factory_bindings_;
   mojo::Connector* connector_;
   scoped_ptr<ws::ConnectionManager> connection_manager_;
   scoped_refptr<GpuState> gpu_state_;
   scoped_ptr<ui::PlatformEventSource> event_source_;
   mojo::TracingImpl tracing_;
   using PendingRequests = std::vector<scoped_ptr<PendingRequest>>;
   PendingRequests pending_requests_;
   scoped_ptr<ws::WindowTreeFactory> window_tree_factory_;
 
   // Surfaces
   scoped_refptr<SurfacesState> surfaces_state_;
 
   DISALLOW_COPY_AND_ASSIGN(MandolineUIServicesApp);
 };
 
 }  // namespace mus
 
 #endif  // COMPONENTS_MUS_MUS_APP_H_