Changes how window manager obtains WindowTree from 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 <memory>
 #include <string>
 #include <vector>
 
 #include "base/macros.h"
 #include "base/memory/weak_ptr.h"
 #include "components/mus/public/interfaces/clipboard.mojom.h"
 #include "components/mus/public/interfaces/display.mojom.h"
 #include "components/mus/public/interfaces/gpu.mojom.h"
 #include "components/mus/public/interfaces/gpu_service.mojom.h"
 #include "components/mus/public/interfaces/user_access_manager.mojom.h"
-#include "components/mus/public/interfaces/window_manager_factory.mojom.h"
+#include "components/mus/public/interfaces/window_manager_window_tree_factory.mojom.h"
 #include "components/mus/public/interfaces/window_server_test.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/platform_display_init_params.h"
 #include "components/mus/ws/user_id.h"
 #include "components/mus/ws/window_server_delegate.h"
 #include "services/shell/public/cpp/application_runner.h"
 #include "services/shell/public/cpp/interface_factory.h"
 #include "services/shell/public/cpp/shell_client.h"
 #include "services/tracing/public/cpp/tracing_impl.h"
@@ skipping 22 matching lines @@
 }
 
 class MusApp
     : public shell::ShellClient,
       public ws::WindowServerDelegate,
       public shell::InterfaceFactory<mojom::Clipboard>,
       public shell::InterfaceFactory<mojom::DisplayManager>,
       public shell::InterfaceFactory<mojom::Gpu>,
       public shell::InterfaceFactory<mojom::GpuService>,
       public shell::InterfaceFactory<mojom::UserAccessManager>,
-      public shell::InterfaceFactory<mojom::WindowManagerFactoryService>,
+      public shell::InterfaceFactory<mojom::WindowManagerWindowTreeFactory>,
       public shell::InterfaceFactory<mojom::WindowTreeFactory>,
       public shell::InterfaceFactory<mojom::WindowTreeHostFactory>,
       public shell::InterfaceFactory<mojom::WindowServerTest> {
  public:
   MusApp();
   ~MusApp() override;
 
  private:
   // Holds InterfaceRequests received before the first WindowTreeHost Display
   // has been established.
@@ skipping 37 matching lines @@
               mojom::GpuRequest request) override;
 
   // shell::InterfaceFactory<mojom::GpuService> implementation.
   void Create(shell::Connection* connection,
               mojom::GpuServiceRequest request) override;
 
   // shell::InterfaceFactory<mojom::UserAccessManager> implementation.
   void Create(shell::Connection* connection,
               mojom::UserAccessManagerRequest request) override;
 
-  // shell::InterfaceFactory<mojom::WindowManagerFactoryService> implementation.
+  // shell::InterfaceFactory<mojom::WindowManagerWindowTreeFactory>
+  // implementation.
   void Create(shell::Connection* connection,
-              mojom::WindowManagerFactoryServiceRequest request) override;
+              mojom::WindowManagerWindowTreeFactoryRequest request) override;
 
   // shell::InterfaceFactory<mojom::WindowTreeFactory>:
   void Create(shell::Connection* connection,
               mojom::WindowTreeFactoryRequest request) override;
 
   // shell::InterfaceFactory<mojom::WindowTreeHostFactory>:
   void Create(shell::Connection* connection,
               mojom::WindowTreeHostFactoryRequest request) override;
 
   // shell::InterfaceFactory<mojom::WindowServerTest> implementation.
@@ skipping 24 matching lines @@
   std::unique_ptr<ws::PlatformScreen> platform_screen_;
 
   base::WeakPtrFactory<MusApp> weak_ptr_factory_;
 
   DISALLOW_COPY_AND_ASSIGN(MusApp);
 };
 
 }  // namespace mus
 
 #endif  // COMPONENTS_MUS_MUS_APP_H_