[WIP] ScreenManager: Add an external window mode

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 212 matching lines @@
 
   screen_manager_->AddInterfaces(registry);
 
 #if defined(USE_OZONE)
   ui::OzonePlatform::GetInstance()->AddInterfaces(registry);
 #endif
 
   return true;
 }
 
-void Service::StartDisplayInit() {
-  screen_manager_->Init(window_server_->display_manager());
+void Service::StartDisplayInit(bool window_manager_connected) {
+  screen_manager_->Init(window_server_->display_manager(),

[rjkroege, 2017/01/23 21:19:43]

I have a mild preference for using if here with the expectation that this might
become more involved.

[fwang, 2017/01/24 17:11:51]

Done.

+                        window_manager_connected
+                            ? display::ScreenManager::WINDOW_MODE_INTERNAL
+                            : display::ScreenManager::WINDOW_MODE_EXTERNAL);
 }
 
 void Service::OnFirstDisplayReady() {
   PendingRequests requests;
   requests.swap(pending_requests_);
   for (auto& request : requests) {
     if (request->wtf_request)
       Create(request->remote_identity, std::move(*request->wtf_request));
     else
       Create(request->remote_identity, std::move(*request->dm_request));
@@ skipping 120 matching lines @@
                      mojom::WindowServerTestRequest request) {
   if (!test_config_)
     return;
   mojo::MakeStrongBinding(
       base::MakeUnique<ws::WindowServerTestImpl>(window_server_.get()),
       std::move(request));
 }
 
 
 }  // namespace ui