Makes WindowTree::DeleteWindow() unembed for roots

services/ui/ws/window_tree.h

 // 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.
 
 #ifndef SERVICES_UI_WS_WINDOW_TREE_H_
 #define SERVICES_UI_WS_WINDOW_TREE_H_
 
 #include <stdint.h>
 
 #include <map>
@@ skipping 208 matching lines @@
                                     const std::vector<uint8_t>* new_data,
                                     bool originated_change);
   void ProcessWindowHierarchyChanged(const ServerWindow* window,
                                      const ServerWindow* new_parent,
                                      const ServerWindow* old_parent,
                                      bool originated_change);
   void ProcessWindowReorder(const ServerWindow* window,
                             const ServerWindow* relative_window,
                             mojom::OrderDirection direction,
                             bool originated_change);
-  void ProcessWindowDeleted(const ServerWindow* window, bool originated_change);
+  void ProcessWindowDeleted(ServerWindow* window, bool originated_change);
   void ProcessWillChangeWindowVisibility(const ServerWindow* window,
                                          bool originated_change);
   void ProcessWindowOpacityChanged(const ServerWindow* window,
                                    float old_opacity,
                                    float new_opacity,
                                    bool originated_change);
   void ProcessCursorChanged(const ServerWindow* window,
                             int32_t cursor_id,
                             bool originated_change);
   void ProcessFocusChanged(const ServerWindow* old_focused_window,
@@ skipping 29 matching lines @@
     // Change id we created for the window manager.
     uint32_t wm_change_id;
   };
 
   enum class RemoveRootReason {
     // The window is being removed.
     DELETED,
 
     // Another client is being embedded in the window.
     EMBED,
+
+    // The embedded client explicitly asked to be unembedded.
+    UNEMBED,
   };
 
   bool ShouldRouteToWindowManager(const ServerWindow* window) const;
 
   ClientWindowId ClientWindowIdForWindow(const ServerWindow* window) const;
 
   // Returns true if |id| is a valid WindowId for a new window.
   bool IsValidIdForNewWindow(const ClientWindowId& id) const;
 
   WindowId GenerateNewWindowId();
@@ skipping 18 matching lines @@
   bool RemoveFromMaps(const ServerWindow* window);
 
   // Removes |window| and all its descendants from the necessary maps. This
   // does not recurse through windows that were created by this tree. All
   // windows owned by this tree are added to |local_windows|.
   void RemoveFromKnown(const ServerWindow* window,
                        std::vector<ServerWindow*>* local_windows);
 
   // Removes a root from set of roots of this tree. This does not remove
   // the window from the window tree, only from the set of roots.
-  void RemoveRoot(const ServerWindow* window, RemoveRootReason reason);
+  void RemoveRoot(ServerWindow* window, RemoveRootReason reason);
 
   // Converts Window(s) to WindowData(s) for transport. This assumes all the
   // windows are valid for the client. The parent of windows the client is not
   // allowed to see are set to NULL (in the returned WindowData(s)).
   mojo::Array<mojom::WindowDataPtr> WindowsToWindowDatas(
       const std::vector<const ServerWindow*>& windows);
   mojom::WindowDataPtr WindowToWindowData(const ServerWindow* window);
 
   // Implementation of GetWindowTree(). Adds |window| to |windows| and recurses
   // if CanDescendIntoWindowForWindowTree() returns true.
@@ skipping 227 matching lines @@
       waiting_for_top_level_window_info_;
   bool embedder_intercepts_events_ = false;
 
   DISALLOW_COPY_AND_ASSIGN(WindowTree);
 };
 
 }  // namespace ws
 }  // namespace ui
 
 #endif  // SERVICES_UI_WS_WINDOW_TREE_H_