Changes ownership of WindowTreeClient

ash/mus/window_manager.h

 // Copyright 2015 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 ASH_MUS_WINDOW_MANAGER_H_
 #define ASH_MUS_WINDOW_MANAGER_H_
 
 #include <stdint.h>
 
 #include <memory>
@@ skipping 35 matching lines @@
 // WindowTreeClientDelegate for mash. WindowManager creates (and owns)
 // a RootWindowController per Display. WindowManager takes ownership of
 // the WindowTreeClient.
 class WindowManager : public ui::WindowManagerDelegate,
                       public ui::WindowObserver,
                       public ui::WindowTreeClientDelegate {
  public:
   explicit WindowManager(shell::Connector* connector);
   ~WindowManager() override;
 
-  void Init(ui::WindowTreeClient* window_tree_client);
+  void Init(std::unique_ptr<ui::WindowTreeClient> window_tree_client);
 
   WmShellMus* shell() { return shell_.get(); }
 
-  ui::WindowTreeClient* window_tree_client() { return window_tree_client_; }
+  ui::WindowTreeClient* window_tree_client() {
+    return window_tree_client_.get();
+  }
 
   ui::WindowManagerClient* window_manager_client() {
     return window_manager_client_;
   }
 
   shell::Connector* connector() { return connector_; }
 
   void SetScreenLocked(bool is_locked);
 
   // Creates a new top level window.
@@ skipping 12 matching lines @@
   void AddObserver(WindowManagerObserver* observer);
   void RemoveObserver(WindowManagerObserver* observer);
 
  private:
   friend class WmTestHelper;
 
   RootWindowController* CreateRootWindowController(
       ui::Window* window,
       const display::Display& display);
 
+  void Shutdown();
+
   // ui::WindowObserver:
   void OnWindowDestroying(ui::Window* window) override;
   void OnWindowDestroyed(ui::Window* window) override;
 
   // WindowTreeClientDelegate:
   void OnEmbed(ui::Window* root) override;
-  void OnDidDestroyClient(ui::WindowTreeClient* client) override;
+  void OnEmbedRootDestroyed(ui::Window* root) override;
+  void OnLostConnection(ui::WindowTreeClient* client) override;
   void OnPointerEventObserved(const ui::PointerEvent& event,
                               ui::Window* target) override;
 
   // WindowManagerDelegate:
   void SetWindowManagerClient(ui::WindowManagerClient* client) override;
   bool OnWmSetBounds(ui::Window* window, gfx::Rect* bounds) override;
   bool OnWmSetProperty(
       ui::Window* window,
       const std::string& name,
       std::unique_ptr<std::vector<uint8_t>>* new_data) override;
   ui::Window* OnWmCreateTopLevelWindow(
       std::map<std::string, std::vector<uint8_t>>* properties) override;
   void OnWmClientJankinessChanged(const std::set<ui::Window*>& client_windows,
                                   bool not_responding) override;
   void OnWmNewDisplay(ui::Window* window,
                       const display::Display& display) override;
   void OnWmPerformMoveLoop(ui::Window* window,
                            ui::mojom::MoveLoopSource source,
                            const gfx::Point& cursor_location,
                            const base::Callback<void(bool)>& on_done) override;
   void OnWmCancelMoveLoop(ui::Window* window) override;
   ui::mojom::EventResult OnAccelerator(uint32_t id,
                                        const ui::Event& event) override;
 
   shell::Connector* connector_;
 
-  ui::WindowTreeClient* window_tree_client_ = nullptr;
+  std::unique_ptr<ui::WindowTreeClient> window_tree_client_;
 
   ui::WindowManagerClient* window_manager_client_ = nullptr;
 
   std::unique_ptr<views::PointerWatcherEventRouter>
       pointer_watcher_event_router_;
 
   std::unique_ptr<ShadowController> shadow_controller_;
 
   std::set<std::unique_ptr<RootWindowController>> root_window_controllers_;
 
   base::ObserverList<WindowManagerObserver> observers_;
 
   std::unique_ptr<display::Screen> screen_;
 
   std::unique_ptr<WmShellMus> shell_;
 
   std::unique_ptr<WmLookupMus> lookup_;
 
   std::map<uint16_t, AcceleratorHandler*> accelerator_handlers_;
   uint16_t next_accelerator_namespace_id_ = 0u;
 
   DISALLOW_COPY_AND_ASSIGN(WindowManager);
 };
 
 }  // namespace mus
 }  // namespace ash
 
 #endif  // ASH_MUS_WINDOW_MANAGER_H_