Changes ownership of ClientConnection

components/mus/ws/window_tree_host_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 "components/mus/ws/window_tree_host_impl.h"
 
 #include "base/debug/debugger.h"
 #include "base/strings/utf_string_conversions.h"
 #include "components/mus/common/types.h"
-// #include "components/mus/public/interfaces/input_event_constants.mojom.h"
 #include "components/mus/ws/client_connection.h"
 #include "components/mus/ws/connection_manager.h"
 #include "components/mus/ws/connection_manager_delegate.h"
 #include "components/mus/ws/display_manager.h"
 #include "components/mus/ws/focus_controller.h"
 #include "components/mus/ws/window_manager_factory_service.h"
 #include "components/mus/ws/window_manager_state.h"
 #include "components/mus/ws/window_tree_host_connection.h"
 #include "components/mus/ws/window_tree_impl.h"
 #include "mojo/common/common_type_converters.h"
@@ skipping 347 matching lines @@
   event_ack_timer_.Start(FROM_HERE, max_delay, this,
                          &WindowTreeHostImpl::OnEventAckTimeout);
 
   tree_awaiting_input_ack_ = connection;
   connection->DispatchInputEvent(target, mojom::Event::From(event));
 }
 
 void WindowTreeHostImpl::CreateWindowManagerStatesFromRegistry() {
   std::vector<WindowManagerFactoryService*> services =
       connection_manager_->window_manager_factory_registry()->GetServices();
-  mojom::DisplayPtr display = connection_manager_->DisplayForHost(this);
   for (WindowManagerFactoryService* service : services) {
     scoped_ptr<WindowManagerState> wms_ptr(
         new WindowManagerState(this, service->user_id()));
     WindowManagerState* wms = wms_ptr.get();
     window_manager_state_map_[service->user_id()] = std::move(wms_ptr);
-    ClientConnection* client_connection =
-        connection_manager_->delegate()->CreateClientConnectionForWindowManager(
-            this, wms->root(), *display, service->user_id(),
-            service->window_manager_factory());
-    client_connection->service()->ConfigureWindowManager();
-    wms->tree_ = client_connection->service();
+    wms->tree_ = connection_manager_->CreateTreeForWindowManager(
+        this, service->window_manager_factory(), wms->root());
   }
 }
 
 void WindowTreeHostImpl::UpdateNativeCursor(int32_t cursor_id) {
   if (cursor_id != last_cursor_) {
     display_manager_->SetCursorById(cursor_id);
     last_cursor_ = cursor_id;
   }
 }
 
@@ skipping 206 matching lines @@
   DispatchInputEventToWindowImpl(target, in_nonclient_area, event);
 }
 
 void WindowTreeHostImpl::OnWindowDestroyed(ServerWindow* window) {
   windows_needing_frame_destruction_.erase(window);
   window->RemoveObserver(this);
 }
 
 }  // namespace ws
 }  // namespace mus