Eliminate WindowTreeConnection

mash/wm/root_window_controller.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/root_window_controller.h"
 
 #include <stdint.h>
 
 #include <map>
 #include <sstream>
 
 #include "ash/wm/common/always_on_top_controller.h"
 #include "ash/wm/common/dock/docked_window_layout_manager.h"
 #include "ash/wm/common/panels/panel_layout_manager.h"
 #include "ash/wm/common/wm_shell_window_ids.h"
 #include "ash/wm/common/workspace/workspace_layout_manager.h"
 #include "ash/wm/common/workspace/workspace_layout_manager_delegate.h"
 #include "base/bind.h"
 #include "base/command_line.h"
 #include "base/memory/ptr_util.h"
 #include "components/mus/common/event_matcher_util.h"
 #include "components/mus/common/switches.h"
 #include "components/mus/common/util.h"
 #include "components/mus/public/cpp/property_type_converters.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 "components/mus/public/cpp/window_tree_host_factory.h"
 #include "components/mus/public/interfaces/window_manager.mojom.h"
 #include "mash/session/public/interfaces/session.mojom.h"
 #include "mash/wm/background_layout.h"
 #include "mash/wm/bridge/wm_globals_mus.h"
 #include "mash/wm/bridge/wm_root_window_controller_mus.h"
 #include "mash/wm/bridge/wm_shelf_mus.h"
 #include "mash/wm/bridge/wm_window_mus.h"
 #include "mash/wm/container_ids.h"
 #include "mash/wm/fill_layout.h"
@@ skipping 44 matching lines @@
 
   DISALLOW_COPY_AND_ASSIGN(WorkspaceLayoutManagerDelegateImpl);
 };
 
 }  // namespace
 
 // static
 RootWindowController* RootWindowController::CreateFromDisplay(
     WindowManagerApplication* app,
     mus::mojom::DisplayPtr display,
-    mojo::InterfaceRequest<mus::mojom::WindowTreeClient> client_request) {
+    mus::mojom::WindowTreeClientRequest client_request) {
   RootWindowController* controller = new RootWindowController(app);
   controller->display_ = display.To<display::Display>();
-  mus::WindowTreeConnection::CreateForWindowManager(
-      controller, std::move(client_request),
-      mus::WindowTreeConnection::CreateType::DONT_WAIT_FOR_EMBED,
-      controller->window_manager_.get());
+  new mus::WindowTreeClient(controller, controller->window_manager_.get(),
+                            std::move(client_request));
   return controller;
 }
 
 void RootWindowController::Destroy() {
   // See class description for details on lifetime.
   if (root_) {
-    delete root_->connection();
+    delete root_->window_tree();
   } else {
     // This case only happens if we're destroyed before OnEmbed().
     delete this;
   }
 }
 
 shell::Connector* RootWindowController::GetConnector() {
   return app_->connector();
 }
 
@@ skipping 71 matching lines @@
   ash::wm::WmWindow* always_on_top_container =
       wm::WmWindowMus::Get(root)->GetChildByShellWindowId(
           ash::kShellWindowId_AlwaysOnTopContainer);
   always_on_top_controller_.reset(
       new ash::AlwaysOnTopController(always_on_top_container));
 
   AddAccelerators();
 
   window_manager_->Initialize(this, app_->session());
 
-  shadow_controller_.reset(new ShadowController(root->connection()));
+  shadow_controller_.reset(new ShadowController(root->window_tree()));
 
   app_->OnRootWindowControllerDoneInit(this);
 }
 
-void RootWindowController::OnConnectionLost(
-    mus::WindowTreeConnection* connection) {
+void RootWindowController::OnWindowTreeClientDestroyed(
+    mus::WindowTreeClient* client) {
   shadow_controller_.reset();
   delete this;
 }
 
 void RootWindowController::OnEventObserved(const ui::Event& event,
                                            mus::Window* target) {
   // Does not use EventObservers.
 }
 
 void RootWindowController::OnWindowDestroyed(mus::Window* window) {
@@ skipping 23 matching lines @@
     mash::wm::mojom::Container container,
     mash::wm::mojom::Container parent_container) {
   // Set the window's name to the container name (e.g. "Container::LOGIN"),
   // which makes the window hierarchy easier to read.
   std::map<std::string, std::vector<uint8_t>> properties;
   std::ostringstream container_name;
   container_name << container;
   properties[mus::mojom::WindowManager::kName_Property] =
       mojo::ConvertTo<std::vector<uint8_t>>(container_name.str());
 
-  mus::Window* window = root_->connection()->NewWindow(&properties);
+  mus::Window* window = root_->window_tree()->NewWindow(&properties);
   window->set_local_id(ContainerToLocalId(container));
   layout_managers_[window].reset(new FillLayout(window));
   WmWindowMus::Get(window)->SetShellWindowId(
       MashContainerToAshContainer(container));
 
   // User private windows are hidden by default until the window manager learns
   // the lock state, so their contents are never accidentally revealed. Tests,
   // however, usually assume the screen is unlocked.
   const bool is_test = base::CommandLine::ForCurrentProcess()->HasSwitch(
       mus::switches::kUseTestConfig);
@@ skipping 82 matching lines @@
   mus::Window* user_private_panels =
       GetWindowForContainer(mojom::Container::USER_PRIVATE_PANELS);
   WmWindowMus* user_private_panels_wm = WmWindowMus::Get(user_private_panels);
   layout_managers_.erase(user_private_panels);
   user_private_panels_wm->SetLayoutManager(
       base::WrapUnique(new ash::PanelLayoutManager(user_private_panels_wm)));
 }
 
 }  // namespace wm
 }  // namespace mash