Eliminate WindowTreeConnection

mash/wm/bridge/wm_globals_mus.cc

 // 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.
 
 #include "mash/wm/bridge/wm_globals_mus.h"
 
 #include "ash/wm/common/window_resizer.h"
 #include "ash/wm/common/wm_activation_observer.h"
 #include "ash/wm/common/wm_shell_window_ids.h"
 #include "base/memory/ptr_util.h"
 #include "components/mus/common/util.h"
 #include "components/mus/public/cpp/window.h"
-#include "components/mus/public/cpp/window_tree_connection.h"
+#include "components/mus/public/cpp/window_tree_client.h"
 #include "mash/wm/bridge/wm_root_window_controller_mus.h"
 #include "mash/wm/bridge/wm_window_mus.h"
 #include "mash/wm/container_ids.h"
 #include "mash/wm/drag_window_resizer.h"
 #include "mash/wm/public/interfaces/container.mojom.h"
 #include "mash/wm/root_window_controller.h"
 
 namespace mash {
 namespace wm {
 
-WmGlobalsMus::WmGlobalsMus(mus::WindowTreeConnection* connection)
-    : connection_(connection) {
-  connection_->AddObserver(this);
+WmGlobalsMus::WmGlobalsMus(mus::WindowTreeClient* client)
+    : client_(client) {
+  client_->AddObserver(this);
   WmGlobals::Set(this);
 }
 
 WmGlobalsMus::~WmGlobalsMus() {
-  RemoveConnectionObserver();
+  RemoveClientObserver();
   WmGlobals::Set(nullptr);
 }
 
 // static
 WmGlobalsMus* WmGlobalsMus::Get() {
   return static_cast<WmGlobalsMus*>(ash::wm::WmGlobals::Get());
 }
 
 void WmGlobalsMus::AddRootWindowController(
     WmRootWindowControllerMus* controller) {
@@ skipping 23 matching lines @@
   for (WmRootWindowControllerMus* root_window_controller :
        root_window_controllers_) {
     if (root_window_controller->GetDisplay().id() == id)
       return root_window_controller;
   }
   NOTREACHED();
   return nullptr;
 }
 
 ash::wm::WmWindow* WmGlobalsMus::GetFocusedWindow() {
-  return WmWindowMus::Get(connection_->GetFocusedWindow());
+  return WmWindowMus::Get(client_->GetFocusedWindow());
 }
 
 ash::wm::WmWindow* WmGlobalsMus::GetActiveWindow() {
-  return GetToplevelAncestor(connection_->GetFocusedWindow());
+  return GetToplevelAncestor(client_->GetFocusedWindow());
 }
 
 ash::wm::WmWindow* WmGlobalsMus::GetPrimaryRootWindow() {
   return root_window_controllers_[0]->GetWindow();
 }
 
 ash::wm::WmWindow* WmGlobalsMus::GetRootWindowForDisplayId(int64_t display_id) {
   return GetRootWindowControllerWithDisplayId(display_id)->GetWindow();
 }
 
@@ skipping 97 matching lines @@
   if (!window)
     return false;
 
   for (size_t i = 0; i < kNumActivationContainers; ++i) {
     if (window->local_id() == static_cast<int>(kActivationContainers[i]))
       return true;
   }
   return false;
 }
 
-void WmGlobalsMus::RemoveConnectionObserver() {
-  if (!connection_)
+void WmGlobalsMus::RemoveClientObserver() {
+  if (!client_)
     return;
 
-  connection_->RemoveObserver(this);
-  connection_ = nullptr;
+  client_->RemoveObserver(this);
+  client_ = nullptr;
 }
 
 // TODO: support OnAttemptToReactivateWindow, http://crbug.com/615114.
 void WmGlobalsMus::OnWindowTreeFocusChanged(mus::Window* gained_focus,
                                             mus::Window* lost_focus) {
   WmWindowMus* gained_active = GetToplevelAncestor(gained_focus);
   WmWindowMus* lost_active = GetToplevelAncestor(gained_focus);
   if (gained_active == lost_active)
     return;
 
   FOR_EACH_OBSERVER(ash::wm::WmActivationObserver, activation_observers_,
                     OnWindowActivated(gained_active, lost_active));
 }
 
-void WmGlobalsMus::OnWillDestroyConnection(
-    mus::WindowTreeConnection* connection) {
-  DCHECK_EQ(connection, connection_);
-  RemoveConnectionObserver();
+void WmGlobalsMus::OnWillDestroyClient(
+    mus::WindowTreeClient* client) {
+  DCHECK_EQ(client, client_);
+  RemoveClientObserver();
 }
 
 }  // namespace wm
 }  // namespace mash