chromeos: changes how DisplayManagerObservers are notified

services/ui/service.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 "services/ui/service.h"
 
 #include <set>
 
 #include "base/bind.h"
 #include "base/command_line.h"
@@ skipping 11 matching lines @@
 #include "services/service_manager/public/c/main.h"
 #include "services/service_manager/public/cpp/connector.h"
 #include "services/service_manager/public/cpp/service_context.h"
 #include "services/ui/clipboard/clipboard_impl.h"
 #include "services/ui/common/switches.h"
 #include "services/ui/display/screen_manager.h"
 #include "services/ui/ime/ime_registrar_impl.h"
 #include "services/ui/ime/ime_server_impl.h"
 #include "services/ui/ws/accessibility_manager.h"
 #include "services/ui/ws/display_binding.h"
+#include "services/ui/ws/display_creation_config.h"
 #include "services/ui/ws/display_manager.h"
 #include "services/ui/ws/gpu_host.h"
 #include "services/ui/ws/user_activity_monitor.h"
 #include "services/ui/ws/user_display_manager.h"
 #include "services/ui/ws/window_server.h"
 #include "services/ui/ws/window_server_test_impl.h"
 #include "services/ui/ws/window_tree.h"
 #include "services/ui/ws/window_tree_binding.h"
 #include "services/ui/ws/window_tree_factory.h"
 #include "services/ui/ws/window_tree_host_factory.h"
@@ skipping 239 matching lines @@
   if (base::RunLoop::IsRunningOnCurrentThread())
     base::MessageLoop::current()->QuitWhenIdle();
 }
 
 bool Service::IsTestConfig() const {
   return test_config_;
 }
 
 void Service::OnWillCreateTreeForWindowManager(
     bool automatically_create_display_roots) {
-  if (screen_manager_config_ != ScreenManagerConfig::UNKNOWN)
+  if (window_server_->display_creation_config() !=
+      ws::DisplayCreationConfig::UNKNOWN) {
     return;
+  }
 
   DVLOG(3) << "OnWillCreateTreeForWindowManager "
            << automatically_create_display_roots;
-  screen_manager_config_ = automatically_create_display_roots
-                               ? ScreenManagerConfig::INTERNAL
-                               : ScreenManagerConfig::FORWARDING;
-  if (screen_manager_config_ == ScreenManagerConfig::FORWARDING) {
+  ws::DisplayCreationConfig config = automatically_create_display_roots
+                                         ? ws::DisplayCreationConfig::AUTOMATIC
+                                         : ws::DisplayCreationConfig::MANUAL;
+  window_server_->SetDisplayCreationConfig(config);
+  if (window_server_->display_creation_config() ==
+      ws::DisplayCreationConfig::MANUAL) {
 #if defined(USE_OZONE) && defined(OS_CHROMEOS)
     screen_manager_ = base::MakeUnique<display::ScreenManagerForwarding>();
 #else
     CHECK(false);
 #endif
   } else {
     screen_manager_ = display::ScreenManager::Create();
   }
   screen_manager_->AddInterfaces(&registry_);
   if (is_gpu_ready_)
@@ skipping 17 matching lines @@
     mojom::ClipboardRequest request) {
   UserState* user_state = GetUserState(source_info.identity);
   if (!user_state->clipboard)
     user_state->clipboard.reset(new clipboard::ClipboardImpl);
   user_state->clipboard->AddBinding(std::move(request));
 }
 
 void Service::BindDisplayManagerRequest(
     const service_manager::BindSourceInfo& source_info,
     mojom::DisplayManagerRequest request) {
-  // DisplayManagerObservers generally expect there to be at least one display.
-  if (!window_server_->display_manager()->has_displays()) {
+  // Wait for the DisplayManager to be configured before binding display
+  // requests. Otherwise the client sees no displays.
+  if (!window_server_->display_manager()->IsReady()) {
     std::unique_ptr<PendingRequest> pending_request(new PendingRequest);
     pending_request->source_info = source_info;
     pending_request->dm_request.reset(
         new mojom::DisplayManagerRequest(std::move(request)));
     pending_requests_.push_back(std::move(pending_request));
     return;
   }
   window_server_->display_manager()
       ->GetUserDisplayManager(source_info.identity.user_id())
       ->AddDisplayManagerBinding(std::move(request));
@@ skipping 36 matching lines @@
     mojom::WindowManagerWindowTreeFactoryRequest request) {
   AddUserIfNecessary(source_info.identity);
   window_server_->window_manager_window_tree_factory_set()->Add(
       source_info.identity.user_id(), std::move(request));
 }
 
 void Service::BindWindowTreeFactoryRequest(
     const service_manager::BindSourceInfo& source_info,
     mojom::WindowTreeFactoryRequest request) {
   AddUserIfNecessary(source_info.identity);
-  if (!window_server_->display_manager()->has_displays()) {
+  if (!window_server_->display_manager()->IsReady()) {
     std::unique_ptr<PendingRequest> pending_request(new PendingRequest);
     pending_request->source_info = source_info;
     pending_request->wtf_request.reset(
         new mojom::WindowTreeFactoryRequest(std::move(request)));
     pending_requests_.push_back(std::move(pending_request));
     return;
   }
   AddUserIfNecessary(source_info.identity);
   mojo::MakeStrongBinding(
       base::MakeUnique<ws::WindowTreeFactory>(window_server_.get(),
@@ skipping 24 matching lines @@
     mojom::WindowServerTestRequest request) {
   if (!test_config_)
     return;
   mojo::MakeStrongBinding(
       base::MakeUnique<ws::WindowServerTestImpl>(window_server_.get()),
       std::move(request));
 }
 
 
 }  // namespace ui