Renames some WindowManager classes

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 <vector>
@@ skipping 27 matching lines @@
 
 namespace ws {
 class ConnectionManager;
 class ForwardingWindowManager;
 }
 
 class MandolineUIServicesApp
     : public mojo::ApplicationDelegate,
       public ws::ConnectionManagerDelegate,
       public mojo::InterfaceFactory<mojom::DisplayManager>,
-      public mojo::InterfaceFactory<mojom::WindowManager>,
+      public mojo::InterfaceFactory<mojom::WindowManagerDeprecated>,
       public mojo::InterfaceFactory<mojom::WindowTreeHostFactory>,
       public mojo::InterfaceFactory<mojom::Gpu>,
       public mojom::WindowTreeHostFactory {
  public:
   MandolineUIServicesApp();
   ~MandolineUIServicesApp() override;
 
  private:
   // Holds InterfaceRequests received before the first WindowTreeHost Display
   // has been established.
@@ skipping 11 matching lines @@
       ws::ConnectionManager* connection_manager,
       mojo::InterfaceRequest<mojom::WindowTree> tree_request,
       ws::ServerWindow* root,
       uint32_t policy_bitmask,
       mojom::WindowTreeClientPtr client) override;
 
   // mojo::InterfaceFactory<mojom::DisplayManager> implementation.
   void Create(mojo::ApplicationConnection* connection,
               mojo::InterfaceRequest<mojom::DisplayManager> request) override;
 
-  // mojo::InterfaceFactory<mojom::WindowManager> implementation.
-  void Create(mojo::ApplicationConnection* connection,
-              mojo::InterfaceRequest<mojom::WindowManager> request) override;
+  // mojo::InterfaceFactory<mojom::WindowManagerDeprecated> implementation.
+  void Create(
+      mojo::ApplicationConnection* connection,
+      mojo::InterfaceRequest<mojom::WindowManagerDeprecated> request) override;
 
   // mojo::InterfaceFactory<mojom::WindowTreeHostFactory>:
   void Create(
       mojo::ApplicationConnection* connection,
       mojo::InterfaceRequest<mojom::WindowTreeHostFactory> request) override;
 
   // mojo::InterfaceFactory<mojom::Gpu> implementation.
   void Create(mojo::ApplicationConnection* connection,
               mojo::InterfaceRequest<mojom::Gpu> request) override;
 
   // mojom::WindowTreeHostFactory implementation.
-  void CreateWindowTreeHost(mojo::InterfaceRequest<mojom::WindowTreeHost> host,
-                            mojom::WindowTreeHostClientPtr host_client,
-                            mojom::WindowTreeClientPtr tree_client,
-                            mojom::WindowManagerPtr window_manager) override;
+  void CreateWindowTreeHost(
+      mojo::InterfaceRequest<mojom::WindowTreeHost> host,
+      mojom::WindowTreeHostClientPtr host_client,
+      mojom::WindowTreeClientPtr tree_client,
+      mojom::WindowManagerDeprecatedPtr window_manager) override;
 
   mojo::WeakBindingSet<mojom::WindowTreeHostFactory> factory_bindings_;
   scoped_ptr<ws::ForwardingWindowManager> window_manager_impl_;
-  mojo::WeakBindingSet<mojom::WindowManager> window_manager_bindings_;
+  mojo::WeakBindingSet<mojom::WindowManagerDeprecated> window_manager_bindings_;
   mojo::ApplicationImpl* app_impl_;
   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_;
 
   // Surfaces
   scoped_refptr<SurfacesState> surfaces_state_;
 
   DISALLOW_COPY_AND_ASSIGN(MandolineUIServicesApp);
 };
 
 }  // namespace mus
 
 #endif  // COMPONENTS_MUS_MUS_APP_H_