c++ / mojo changes for 'external window mode'

services/ui/ws/display.cc

Index: services/ui/ws/display.cc
diff --git a/services/ui/ws/display.cc b/services/ui/ws/display.cc
index 976b84c25a33b434e5997f80c88d6870f22a516c..43549ddf023eb2bc3a9393965a0f7b2db17c26da 100644
--- a/services/ui/ws/display.cc
+++ b/services/ui/ws/display.cc
@@ -62,6 +62,9 @@ Display::~Display() {
 
 void Display::Init(const PlatformDisplayInitParams& init_params,
                    std::unique_ptr<DisplayBinding> binding) {
+  if (window_server_->IsInExternalWindowMode())
+    DCHECK(binding);
+
   binding_ = std::move(binding);
   display_manager()->AddDisplay(this);
 
@@ -204,7 +207,23 @@ void Display::SetTitle(const std::string& title) {
   platform_display_->SetTitle(base::UTF8ToUTF16(title));
 }
 
+void Display::InitDisplayRoot() {
+  DCHECK(window_server_->IsInExternalWindowMode());
+  DCHECK(binding_);
+
+  external_mode_root_ = base::MakeUnique<WindowManagerDisplayRoot>(this);
+  window_manager_display_root_map_[service_manager::mojom::kRootUserID] =
+      external_mode_root_.get();
+
+  ServerWindow* server_window = external_mode_root_->root();
+  WindowTree* window_tree = window_server_->GetTreeForExternalWindowMode();
+  window_tree->AddRoot(server_window);
+  window_tree->DoOnEmbed(nullptr /*mojom::WindowTreePtr*/, server_window);
+}
+
 void Display::InitWindowManagerDisplayRoots() {
+  // Tests can create ws::Display instances, directly by-passing
+  // WindowTreeHostFactory.
   if (binding_) {
     std::unique_ptr<WindowManagerDisplayRoot> display_root_ptr(
         new WindowManagerDisplayRoot(this));
@@ -220,7 +239,6 @@ void Display::InitWindowManagerDisplayRoots() {
   } else {
     CreateWindowManagerDisplayRootsFromFactories();
   }
-  display_manager()->OnDisplayUpdate(this);
 }
 
 void Display::CreateWindowManagerDisplayRootsFromFactories() {
@@ -274,7 +292,13 @@ ServerWindow* Display::GetRootWindow() {
 
 void Display::OnAcceleratedWidgetAvailable() {
   display_manager()->OnDisplayAcceleratedWidgetAvailable(this);
-  InitWindowManagerDisplayRoots();
+
+  if (window_server_->IsInExternalWindowMode())
+    InitDisplayRoot();
+  else
+    InitWindowManagerDisplayRoots();
+
+  display_manager()->OnDisplayUpdate(this);
 }
 
 bool Display::IsInHighContrastMode() {
@@ -283,7 +307,7 @@ bool Display::IsInHighContrastMode() {
 
 void Display::OnEvent(const ui::Event& event) {
   WindowManagerDisplayRoot* display_root = GetActiveWindowManagerDisplayRoot();
-  if (display_root)
+  if (display_root && display_root->window_manager_state())
     display_root->window_manager_state()->ProcessEvent(event, GetId());
   window_server_
       ->GetUserActivityMonitorForUser(
@@ -293,7 +317,7 @@ void Display::OnEvent(const ui::Event& event) {
 
 void Display::OnNativeCaptureLost() {
   WindowManagerDisplayRoot* display_root = GetActiveWindowManagerDisplayRoot();
-  if (display_root)
+  if (display_root && display_root->window_manager_state())
     display_root->window_manager_state()->SetCapture(nullptr, kInvalidClientId);
 }
 
@@ -376,7 +400,7 @@ void Display::OnFocusChanged(FocusControllerChangeSource change_source,
 
   // WindowManagers are always notified of focus changes.
   WindowManagerDisplayRoot* display_root = GetActiveWindowManagerDisplayRoot();
-  if (display_root) {
+  if (display_root && display_root->window_manager_state()) {
     WindowTree* wm_tree = display_root->window_manager_state()->window_tree();
     if (wm_tree != owning_tree_old && wm_tree != embedded_tree_old &&
         wm_tree != owning_tree_new && wm_tree != embedded_tree_new) {