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

services/ui/ws/display.h

 // Copyright 2015 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.
 
 #ifndef SERVICES_UI_WS_DISPLAY_H_
 #define SERVICES_UI_WS_DISPLAY_H_
 
 #include <stdint.h>
 
 #include <map>
@@ skipping 134 matching lines @@
 
   // Returns the root window of the active user.
   ServerWindow* GetActiveRootWindow();
 
  private:
   friend class test::DisplayTestApi;
 
   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
   // WindowManagerWindowTreeFactorySet.
   void CreateWindowManagerDisplayRootsFromFactories();
 
   void CreateWindowManagerDisplayRootFromFactory(
       WindowManagerWindowTreeFactory* factory);
 
   // Creates the root ServerWindow for this display, where |size| is in physical
@@ skipping 31 matching lines @@
   std::unique_ptr<PlatformDisplay> platform_display_;
   std::unique_ptr<FocusController> focus_controller_;
 
   // The last cursor set. Used to track whether we need to change the cursor.
   mojom::Cursor last_cursor_;
 
   ServerWindowTracker activation_parents_;
 
   WindowManagerDisplayRootMap window_manager_display_root_map_;
 
+  std::unique_ptr<WindowManagerDisplayRoot> external_window_mode_display_root_;

[kylechar, 2017/03/07 18:19:37]

|external_mode_root_| maybe?

[tonikitoo, 2017/03/07 20:09:36]

Will fix.

+
   DISALLOW_COPY_AND_ASSIGN(Display);
 };
 
 }  // namespace ws
 }  // namespace ui
 
 #endif  // SERVICES_UI_WS_DISPLAY_H_