Changes ownership of ClientConnection

components/mus/ws/connection_manager.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 COMPONENTS_MUS_WS_CONNECTION_MANAGER_H_
 #define COMPONENTS_MUS_WS_CONNECTION_MANAGER_H_
 
 #include <stdint.h>
 
 #include <map>
@@ skipping 70 matching lines @@
   ServerWindow* CreateServerWindow(
       const WindowId& id,
       const std::map<std::string, std::vector<uint8_t>>& properties);
 
   // Returns the id for the next WindowTreeImpl.
   ConnectionSpecificId GetAndAdvanceNextConnectionId();
 
   // Returns the id for the next WindowTreeHostImpl.
   uint16_t GetAndAdvanceNextHostId();
 
-  // Invoked when a WindowTreeImpl's connection encounters an error.
-  void OnConnectionError(ClientConnection* connection);
-
-  ClientConnection* GetClientConnection(WindowTreeImpl* window_tree);
-
   // See description of WindowTree::Embed() for details. This assumes
   // |transport_window_id| is valid.
   WindowTreeImpl* EmbedAtWindow(ServerWindow* root,
                                 uint32_t policy_bitmask,
                                 mojom::WindowTreeClientPtr client);
 
-  // Adds |connection| to internal maps.
-  void AddConnection(scoped_ptr<ClientConnection> owned_connection,
-                     mojom::WindowTreePtr tree_ptr);
+  // Adds |tree_impl_ptr| to the set of known trees. Use DestroyTree() to
+  // destroy the tree.
+  WindowTreeImpl* AddTree(scoped_ptr<WindowTreeImpl> tree_impl_ptr,
+                          scoped_ptr<ClientConnection> connection,
+                          mojom::WindowTreePtr tree_ptr);
+  WindowTreeImpl* CreateTreeForWindowManager(
+      WindowTreeHostImpl* host,
+      mojom::WindowManagerFactory* factory,
+      ServerWindow* root);
+  // Invoked when a WindowTreeImpl's connection encounters an error.
+  void DestroyTree(WindowTreeImpl* tree);
 
   // Returns the connection by id.
   WindowTreeImpl* GetConnection(ConnectionSpecificId connection_id);
 
   // Returns the Window identified by |id|.
   ServerWindow* GetWindow(const WindowId& id);
 
   // Schedules a paint for the specified region in the coordinates of |window|.
   void SchedulePaint(const ServerWindow* window, const gfx::Rect& bounds);
 
@@ skipping 98 matching lines @@
                             const ServerWindow* relative_window,
                             const mojom::OrderDirection direction);
   void ProcessWindowDeleted(const ServerWindow* window);
   void ProcessWillChangeWindowPredefinedCursor(ServerWindow* window,
                                                int32_t cursor_id);
   void ProcessFrameDecorationValuesChanged(WindowTreeHostImpl* host);
 
  private:
   friend class Operation;
 
-  using ConnectionMap = std::map<ConnectionSpecificId, ClientConnection*>;
+  using WindowTreeMap =
+      std::map<ConnectionSpecificId, scoped_ptr<WindowTreeImpl>>;
   using HostConnectionMap =
       std::map<WindowTreeHostImpl*, WindowTreeHostConnection*>;
 
   struct InFlightWindowManagerChange {
     // Identifies the client that initiated the change.
     ConnectionSpecificId connection_id;
 
     // Change id supplied by the client.
     uint32_t client_change_id;
   };
@@ skipping 82 matching lines @@
   // State for rendering into a Surface.
   scoped_refptr<mus::SurfacesState> surfaces_state_;
 
   // ID to use for next WindowTreeImpl.
   ConnectionSpecificId next_connection_id_;
 
   // ID to use for next WindowTreeHostImpl.
   uint16_t next_host_id_;
 
   // Set of WindowTreeImpls.
-  ConnectionMap connection_map_;
+  WindowTreeMap tree_map_;
 
   // WindowTreeHostImpls are initially added to |pending_hosts_|. When the
   // display is initialized it is moved to |hosts_|.
   // ConnectionManager owns the WindowTreeHostImpls.
   std::set<WindowTreeHostImpl*> pending_hosts_;
   std::set<WindowTreeHostImpl*> hosts_;
 
   // If non-null then we're processing a client operation. The Operation is
   // not owned by us (it's created on the stack by WindowTreeImpl).
   Operation* current_operation_;
@@ skipping 17 matching lines @@
 
   WindowManagerFactoryRegistry window_manager_factory_registry_;
 
   DISALLOW_COPY_AND_ASSIGN(ConnectionManager);
 };
 
 }  // namespace ws
 }  // namespace mus
 
 #endif  // COMPONENTS_MUS_WS_CONNECTION_MANAGER_H_