Eliminate WindowTreeConnection

mash/wm/window_manager.cc

 // 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.
 
 #include "mash/wm/window_manager.h"
 
 #include <stdint.h>
 
 #include <utility>
 
 #include "ash/wm/common/container_finder.h"
 #include "components/mus/common/types.h"
 #include "components/mus/public/cpp/property_type_converters.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 "components/mus/public/interfaces/input_events.mojom.h"
 #include "components/mus/public/interfaces/mus_constants.mojom.h"
 #include "components/mus/public/interfaces/window_manager.mojom.h"
 #include "mash/wm/bridge/wm_window_mus.h"
 #include "mash/wm/non_client_frame_controller.h"
 #include "mash/wm/property_util.h"
 #include "mash/wm/public/interfaces/container.mojom.h"
 #include "mash/wm/root_window_controller.h"
 
 namespace mash {
@@ skipping 55 matching lines @@
   DCHECK(root);
 
   // TODO(sky): panels need a different frame, http:://crbug.com/614362.
   const bool provide_non_client_frame =
       GetWindowType(*properties) == mus::mojom::WindowType::WINDOW ||
       GetWindowType(*properties) == mus::mojom::WindowType::PANEL;
   if (provide_non_client_frame)
     (*properties)[mus::mojom::kWaitForUnderlay_Property].clear();
 
   // TODO(sky): constrain and validate properties before passing to server.
-  mus::Window* window = root->connection()->NewWindow(properties);
+  mus::Window* window = root->window_tree()->NewWindow(properties);
   window->SetBounds(CalculateDefaultBounds(window));
 
   mus::Window* container_window = nullptr;
   if (window->HasSharedProperty(mojom::kWindowContainer_Property)) {
     container_window =
         root_controller_->GetWindowForContainer(GetRequestedContainer(window));
   } else {
     // TODO(sky): window->bounds() isn't quite right.
     container_window = WmWindowMus::GetMusWindow(
         ash::wm::GetDefaultParent(WmWindowMus::Get(root_controller_->root()),
@@ skipping 100 matching lines @@
 
 void WindowManager::ScreenlockStateChanged(bool locked) {
   // Hide USER_PRIVATE_CONTAINER windows when the screen is locked.
   mus::Window* window = root_controller_->GetWindowForContainer(
       mash::wm::mojom::Container::USER_PRIVATE);
   window->SetVisible(!locked);
 }
 
 }  // namespace wm
 }  // namespace mash