Eliminate WindowTreeConnection

mash/wm/bridge/wm_window_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_window_mus.h"
 
 #include "ash/wm/common/container_finder.h"
 #include "ash/wm/common/window_state.h"
 #include "ash/wm/common/wm_layout_manager.h"
 #include "ash/wm/common/wm_window_observer.h"
 #include "ash/wm/common/wm_window_property.h"
 #include "components/mus/public/cpp/window.h"
 #include "components/mus/public/cpp/window_property.h"
-#include "components/mus/public/cpp/window_tree_connection.h"
+#include "components/mus/public/cpp/window_tree_client.h"
 #include "mash/wm/bridge/mus_layout_manager_adapter.h"
 #include "mash/wm/bridge/wm_globals_mus.h"
 #include "mash/wm/bridge/wm_root_window_controller_mus.h"
 #include "mash/wm/property_util.h"
 #include "ui/aura/mus/mus_util.h"
 #include "ui/base/hit_test.h"
 #include "ui/display/display.h"
 #include "ui/views/widget/widget.h"
 #include "ui/views/widget/widget_delegate.h"
 
@@ skipping 527 matching lines @@
     window_->RequestClose();
   else
     widget_->Close();
 }
 
 bool WmWindowMus::IsFocused() const {
   return window_->HasFocus();
 }
 
 bool WmWindowMus::IsActive() const {
-  mus::Window* focused = window_->connection()->GetFocusedWindow();
+  mus::Window* focused = window_->window_tree()->GetFocusedWindow();
   return focused && window_->Contains(focused);
 }
 
 void WmWindowMus::Activate() {
   window_->SetFocus();
   ash::wm::WmWindow* top_level = GetToplevelWindow();
   if (!top_level)
     return;
 
   // TODO(sky): mus should do this too.
   GetMusWindow(top_level)->MoveToFront();
 }
 
 void WmWindowMus::Deactivate() {
   if (IsActive())
-    window_->connection()->ClearFocus();
+    window_->window_tree()->ClearFocus();
 }
 
 void WmWindowMus::SetFullscreen() {
   SetWindowShowState(window_, mus::mojom::ShowState::FULLSCREEN);
 }
 
 void WmWindowMus::Maximize() {
   SetWindowShowState(window_, mus::mojom::ShowState::MAXIMIZED);
 }
 
@@ skipping 84 matching lines @@
                     OnWindowBoundsChanged(this, old_bounds, new_bounds));
 }
 
 void WmWindowMus::OnWindowDestroying(mus::Window* window) {
   FOR_EACH_OBSERVER(ash::wm::WmWindowObserver, observers_,
                     OnWindowDestroying(this));
 }
 
 }  // namespace wm
 }  // namespace mash