Eliminate WindowTreeConnection

mash/wm/bridge/wm_globals_mus.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_BRIDGE_WM_GLOBALS_MUS_H_
 #define MASH_WM_BRIDGE_WM_GLOBALS_MUS_H_
 
 #include <stdint.h>
 
 #include <vector>
 
 #include "ash/wm/common/wm_globals.h"
 #include "base/macros.h"
 #include "base/observer_list.h"
-#include "components/mus/public/cpp/window_tree_connection_observer.h"
+#include "components/mus/public/cpp/window_tree_client_observer.h"
 
 namespace mus {
-class WindowTreeConnection;
+class WindowTreeClient;
 }
 
 namespace mash {
 namespace wm {
 
 class WmRootWindowControllerMus;
 class WmWindowMus;
 
 // WmGlobals implementation for mus.
 class WmGlobalsMus : public ash::wm::WmGlobals,
-                     public mus::WindowTreeConnectionObserver {
+                     public mus::WindowTreeClientObserver {
  public:
-  explicit WmGlobalsMus(mus::WindowTreeConnection* connection);
+  explicit WmGlobalsMus(mus::WindowTreeClient* client);
   ~WmGlobalsMus() override;
 
   static WmGlobalsMus* Get();
 
   void AddRootWindowController(WmRootWindowControllerMus* controller);
   void RemoveRootWindowController(WmRootWindowControllerMus* controller);
 
   // Returns the ancestor of |window| (including |window|) that is considered
   // toplevel. |window| may be null.
   static WmWindowMus* GetToplevelAncestor(mus::Window* window);
@@ skipping 25 matching lines @@
   void RemoveDisplayObserver(ash::wm::WmDisplayObserver* observer) override;
   void AddOverviewModeObserver(
       ash::wm::WmOverviewModeObserver* observer) override;
   void RemoveOverviewModeObserver(
       ash::wm::WmOverviewModeObserver* observer) override;
 
  private:
   // Returns true if |window| is a window that can have active children.
   static bool IsActivationParent(mus::Window* window);
 
-  void RemoveConnectionObserver();
+  void RemoveClientObserver();
 
-  // mus::WindowTreeConnectionObserver:
+  // mus::WindowTreeClientObserver:
   void OnWindowTreeFocusChanged(mus::Window* gained_focus,
                                 mus::Window* lost_focus) override;
-  void OnWillDestroyConnection(mus::WindowTreeConnection* connection) override;
+  void OnWillDestroyClient(mus::WindowTreeClient* client) override;
 
-  mus::WindowTreeConnection* connection_;
+  mus::WindowTreeClient* client_;
 
   std::vector<WmRootWindowControllerMus*> root_window_controllers_;
 
   base::ObserverList<ash::wm::WmActivationObserver> activation_observers_;
 
   DISALLOW_COPY_AND_ASSIGN(WmGlobalsMus);
 };
 
 }  // namespace wm
 }  // namespace mash
 
 #endif  // MASH_WM_BRIDGE_WM_GLOBALS_MUS_H_