Eliminate WindowTreeConnection

mash/wm/root_window_controller.h

 // Copyright 2016 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 MASH_WM_ROOT_WINDOW_CONTROLLER_H_
 #define MASH_WM_ROOT_WINDOW_CONTROLLER_H_
 
 #include <memory>
 
 #include "components/mus/public/cpp/window_observer.h"
-#include "components/mus/public/cpp/window_tree_delegate.h"
+#include "components/mus/public/cpp/window_tree_client.h"
+#include "components/mus/public/cpp/window_tree_client_delegate.h"
 #include "components/mus/public/interfaces/window_manager_constants.mojom.h"
 #include "components/mus/public/interfaces/window_tree_host.mojom.h"
 #include "mash/wm/public/interfaces/container.mojom.h"
 #include "mash/wm/shelf_layout_manager_delegate.h"
 #include "mojo/public/cpp/bindings/binding.h"
 #include "ui/display/display.h"
 
 namespace ash {
 class AlwaysOnTopController;
 }
@@ skipping 22 matching lines @@
 class WmRootWindowControllerMus;
 class WmShelfMus;
 class WmTestBase;
 class WmTestHelper;
 
 // RootWindowController manages the windows and state for a single display.
 //
 // RootWindowController deletes itself when the root mus::Window is destroyed.
 // You can trigger deletion explicitly by way of Destroy().
 class RootWindowController : public mus::WindowObserver,
-                             public mus::WindowTreeDelegate,
+                             public mus::WindowTreeClientDelegate,
                              public ShelfLayoutManagerDelegate {
  public:
   static RootWindowController* CreateFromDisplay(
       WindowManagerApplication* app,
       mus::mojom::DisplayPtr display,
       mojo::InterfaceRequest<mus::mojom::WindowTreeClient> client_request);
 
   // Deletes this.
   void Destroy();
 
@@ skipping 26 matching lines @@
 
  private:
   friend class WmTestBase;
   friend class WmTestHelper;
 
   explicit RootWindowController(WindowManagerApplication* app);
   ~RootWindowController() override;
 
   void AddAccelerators();
 
-  // WindowTreeDelegate:
+  // WindowTreeClientDelegate:
   void OnEmbed(mus::Window* root) override;
-  void OnConnectionLost(mus::WindowTreeConnection* connection) override;
+  void OnWindowTreeClientDestroyed(mus::WindowTreeClient* client) override;
   void OnEventObserved(const ui::Event& event, mus::Window* target) override;
 
   // mus::WindowObserver:
   void OnWindowDestroyed(mus::Window* window) override;
 
   // ShelfLayoutManagerDelegate:
   void OnShelfWindowAvailable() override;
 
   // Sets up the window containers used for z-space management.
   void CreateContainer(mash::wm::mojom::Container container,
@@ skipping 17 matching lines @@
 
   std::unique_ptr<ash::AlwaysOnTopController> always_on_top_controller_;
 
   DISALLOW_COPY_AND_ASSIGN(RootWindowController);
 };
 
 }  // namespace wm
 }  // namespace mash
 
 #endif  // MASH_WM_ROOT_WINDOW_CONTROLLER_H_