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

services/ui/ws/display.h

Index: services/ui/ws/display.h
diff --git a/services/ui/ws/display.h b/services/ui/ws/display.h
index 2fae94d743b8df52b14bc9267ddc2b1df7b6fd94..06bade1fb5655b9d66f5d020a0861b1f8d739775 100644
--- a/services/ui/ws/display.h
+++ b/services/ui/ws/display.h
@@ -152,7 +152,11 @@ class Display : public PlatformDisplayDelegate,
   using WindowManagerDisplayRootMap =
       std::map<UserId, WindowManagerDisplayRoot*>;
 
-  // Inits the necessary state once the display is ready.
+  // Inits the display root once the display is ready in
+  // 'external window mode'.
+  void InitDisplayRoot();
+
+  // Inits the necessary WindowManager state once the display is ready.
   void InitWindowManagerDisplayRoots();
 
   // Creates the set of WindowManagerDisplayRoots from the
@@ -204,6 +208,10 @@ class Display : public PlatformDisplayDelegate,
 
   WindowManagerDisplayRootMap window_manager_display_root_map_;
 
+  std::unique_ptr<WindowManagerDisplayRoot> external_window_mode_display_root_;
+
+  bool in_external_window_mode_ = false;
+
   DISALLOW_COPY_AND_ASSIGN(Display);
 };