Refators display related functionality into own class

components/mus/mus_app.cc

 // Copyright 2014 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/mus_app.h"
 
 #include <set>
 
 #include "base/memory/weak_ptr.h"
 #include "base/stl_util.h"
 #include "base/threading/platform_thread.h"
 #include "build/build_config.h"
 #include "components/mus/common/args.h"
 #include "components/mus/gles2/gpu_impl.h"
 #include "components/mus/ws/connection_manager.h"
 #include "components/mus/ws/display.h"
 #include "components/mus/ws/display_binding.h"
+#include "components/mus/ws/display_manager.h"
 #include "components/mus/ws/window_tree.h"
 #include "components/mus/ws/window_tree_binding.h"
 #include "components/mus/ws/window_tree_factory.h"
 #include "components/resource_provider/public/cpp/resource_loader.h"
 #include "mojo/public/c/system/main.h"
 #include "mojo/services/tracing/public/cpp/tracing_impl.h"
 #include "mojo/shell/public/cpp/connection.h"
 #include "mojo/shell/public/cpp/connector.h"
 #include "ui/base/resource/resource_bundle.h"
 #include "ui/base/ui_base_paths.h"
@@ skipping 122 matching lines @@
   requests.swap(pending_requests_);
   for (auto& request : requests) {
     // TODO(sky): this needs to cache user id too!
     if (request->dm_request)
       Create(nullptr, std::move(*request->dm_request));
     else
       Create(nullptr, std::move(*request->wtf_request));
   }
 }
 
-void MandolineUIServicesApp::OnNoMoreRootConnections() {
+void MandolineUIServicesApp::OnNoMoreDisplays() {
   base::MessageLoop::current()->QuitWhenIdle();
 }
 
 scoped_ptr<ws::WindowTreeBinding>
 MandolineUIServicesApp::CreateWindowTreeBindingForEmbedAtWindow(
     ws::ConnectionManager* connection_manager,
     ws::WindowTree* tree,
     mojom::WindowTreeRequest tree_request,
     mojom::WindowTreeClientPtr client) {
   return make_scoped_ptr(new ws::DefaultWindowTreeBinding(
       tree, connection_manager, std::move(tree_request), std::move(client)));
 }
 
 void MandolineUIServicesApp::CreateDefaultDisplays() {
   // Display manages its own lifetime.
   ws::Display* host_impl = new ws::Display(
       connection_manager_.get(), connector_, gpu_state_, surfaces_state_);
   host_impl->Init(nullptr);
 }
 
 void MandolineUIServicesApp::Create(mojo::Connection* connection,
                                     mojom::DisplayManagerRequest request) {
-  if (!connection_manager_->has_displays()) {
+  if (!connection_manager_->display_manager()->has_displays()) {
     scoped_ptr<PendingRequest> pending_request(new PendingRequest);
     pending_request->dm_request.reset(
         new mojo::InterfaceRequest<mojom::DisplayManager>(std::move(request)));
     pending_requests_.push_back(std::move(pending_request));
     return;
   }
   connection_manager_->AddDisplayManagerBinding(std::move(request));
 }
 
 void MandolineUIServicesApp::Create(
     mojo::Connection* connection,
     mojom::WindowManagerFactoryServiceRequest request) {
   connection_manager_->window_manager_factory_registry()->Register(
       connection->GetRemoteUserID(), std::move(request));
 }
 
 void MandolineUIServicesApp::Create(Connection* connection,
                                     mojom::WindowTreeFactoryRequest request) {
-  if (!connection_manager_->has_displays()) {
+  if (!connection_manager_->display_manager()->has_displays()) {
     scoped_ptr<PendingRequest> pending_request(new PendingRequest);
     pending_request->wtf_request.reset(
         new mojo::InterfaceRequest<mojom::WindowTreeFactory>(
             std::move(request)));
     pending_requests_.push_back(std::move(pending_request));
     return;
   }
   if (!window_tree_factory_) {
     window_tree_factory_.reset(
         new ws::WindowTreeFactory(connection_manager_.get()));
@@ skipping 23 matching lines @@
   ws::Display* host_impl = new ws::Display(
       connection_manager_.get(), connector_, gpu_state_, surfaces_state_);
 
   scoped_ptr<ws::DisplayBindingImpl> display_binding(new ws::DisplayBindingImpl(
       std::move(host), host_impl, std::move(tree_client),
       connection_manager_.get()));
   host_impl->Init(std::move(display_binding));
 }
 
 }  // namespace mus