Adds ability for WindowManager to create display roots

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 32 matching lines @@
 class WindowManagerDisplayRoot;
 class WindowServer;
 class WindowTree;
 
 namespace test {
 class DisplayTestApi;
 }
 
 // Displays manages the state associated with a single display. Display has a
 // single root window whose children are the roots for a per-user
-// WindowManager. Display is configured in two distinct
-// ways:
+// WindowManager. Display is configured in two distinct ways:
 // . with a DisplayBinding. In this mode there is only ever one WindowManager
 //   for the display, which comes from the client that created the
 //   Display.
 // . without a DisplayBinding. In this mode a WindowManager is automatically
 //   created per user.
 class Display : public PlatformDisplayDelegate,
                 public mojom::WindowTreeHost,
                 public FocusControllerObserver,
                 public FocusControllerDelegate,
                 public UserIdTrackerObserver,
@@ skipping 74 matching lines @@
   void AddActivationParent(ServerWindow* window);
   void RemoveActivationParent(ServerWindow* window);
 
   void UpdateTextInputState(ServerWindow* window,
                             const ui::TextInputState& state);
   void SetImeVisibility(ServerWindow* window, bool visible);
 
   // Called just before |tree| is destroyed.
   void OnWillDestroyTree(WindowTree* tree);
 
+  // Removes |display_root| from internal maps. This called prior to
+  // |display_root| being destroyed.
+  void RemoveWindowManagerDisplayRoot(WindowManagerDisplayRoot* display_root);
+
   void UpdateNativeCursor(mojom::CursorType cursor_id);
 
   // mojom::WindowTreeHost:
   void SetSize(const gfx::Size& size) override;
   void SetTitle(const std::string& title) override;
 
   // Updates the size of display root ServerWindow and WM root ServerWindow(s).
   void OnViewportMetricsChanged(const display::ViewportMetrics& metrics);
 
   // Returns the root window of the active user.
@@ skipping 64 matching lines @@
 
   WindowManagerDisplayRootMap window_manager_display_root_map_;
 
   DISALLOW_COPY_AND_ASSIGN(Display);
 };
 
 }  // namespace ws
 }  // namespace ui
 
 #endif  // SERVICES_UI_WS_DISPLAY_H_