Eliminate WindowTreeConnection

mash/wm/user_window_controller_impl.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/user_window_controller_impl.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 "mash/wm/property_util.h"
 #include "mash/wm/public/interfaces/container.mojom.h"
 #include "mash/wm/root_window_controller.h"
 #include "mojo/common/common_type_converters.h"
 #include "ui/resources/grit/ui_resources.h"
 
 MUS_DECLARE_WINDOW_PROPERTY_TYPE(uint32_t);
 
 namespace mash {
 namespace wm {
@@ skipping 12 matching lines @@
 
 // Get a UserWindow struct from a mus::Window.
 mojom::UserWindowPtr GetUserWindow(mus::Window* window) {
   mojom::UserWindowPtr user_window(mojom::UserWindow::New());
   DCHECK_NE(0u, window->GetLocalProperty(kUserWindowIdKey));
   user_window->window_id = window->GetLocalProperty(kUserWindowIdKey);
   user_window->window_title = mojo::String::From(GetWindowTitle(window));
   user_window->window_app_icon = GetWindowAppIcon(window);
   user_window->window_app_id = mojo::String::From(GetAppID(window));
   user_window->ignored_by_shelf = GetWindowIgnoredByShelf(window);
-  mus::Window* focused = window->connection()->GetFocusedWindow();
+  mus::Window* focused = window->window_tree()->GetFocusedWindow();
   focused = GetTopLevelWindow(focused, window->parent());
   user_window->window_has_focus = focused == window;
   return user_window;
 }
 
 }  // namespace
 
 // Observes property changes on user windows. UserWindowControllerImpl uses
 // this separate observer to avoid observing duplicate tree change
 // notifications.
@@ skipping 41 matching lines @@
 
   RemoveObservers(user_container);
 }
 
 void UserWindowControllerImpl::Initialize(
     RootWindowController* root_controller) {
   DCHECK(root_controller);
   DCHECK(!root_controller_);
   root_controller_ = root_controller;
   GetUserWindowContainer()->AddObserver(this);
-  GetUserWindowContainer()->connection()->AddObserver(this);
+  GetUserWindowContainer()->window_tree()->AddObserver(this);
   window_property_observer_.reset(new WindowPropertyObserver(this));
   for (mus::Window* window : GetUserWindowContainer()->children()) {
     AssignIdIfNecessary(window);
     window->AddObserver(window_property_observer_.get());
   }
 }
 
 void UserWindowControllerImpl::AssignIdIfNecessary(mus::Window* window) {
   if (window->GetLocalProperty(kUserWindowIdKey) == 0u)
     window->SetLocalProperty(kUserWindowIdKey, next_id_++);
 }
 
 void UserWindowControllerImpl::RemoveObservers(mus::Window* user_container) {
   user_container->RemoveObserver(this);
-  user_container->connection()->RemoveObserver(this);
+  user_container->window_tree()->RemoveObserver(this);
   for (auto iter : user_container->children())
     iter->RemoveObserver(window_property_observer_.get());
 }
 
 mus::Window* UserWindowControllerImpl::GetUserWindowById(uint32_t id) {
   for (mus::Window* window : GetUserWindowContainer()->children()) {
     if (window->GetLocalProperty(kUserWindowIdKey) == id)
       return window;
   }
   return nullptr;
@@ skipping 60 matching lines @@
 }
 
 void UserWindowControllerImpl::FocusUserWindow(uint32_t window_id) {
   mus::Window* window = GetUserWindowById(window_id);
   if (window)
     window->SetFocus();
 }
 
 }  // namespace wm
 }  // namespace mash