Change type of interface created by mojo:view_manager

mojo/services/view_manager/view_manager_connection.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 MOJO_SERVICES_VIEW_MANAGER_VIEW_MANAGER_CONNECTION_H_
 #define MOJO_SERVICES_VIEW_MANAGER_VIEW_MANAGER_CONNECTION_H_
 
 #include <set>
 #include <vector>
 
@@ skipping 25 matching lines @@
 #endif
 
 // Manages a connection from the client.
 class MOJO_VIEW_MANAGER_EXPORT ViewManagerConnection
     : public InterfaceImpl<IViewManager>,
       public NodeDelegate {
  public:
   explicit ViewManagerConnection(RootNodeManager* root_node_manager);
   virtual ~ViewManagerConnection();
 
+  // Used to mark this connection as originating from a call to
+  // IViewManager::Connect(). When set OnConnectionError() deletes |this|.
+  void set_delete_on_connection_error() { delete_on_connection_error_ = true; }
+
   TransportConnectionId id() const { return id_; }
 
   // Returns the Node with the specified id.
   Node* GetNode(const NodeId& id) {
     return const_cast<Node*>(
         const_cast<const ViewManagerConnection*>(this)->GetNode(id));
   }
   const Node* GetNode(const NodeId& id) const;
 
   // Returns the View with the specified id.
@@ skipping 122 matching lines @@
                                       const Node* old_parent) OVERRIDE;
   virtual void OnNodeViewReplaced(const Node* node,
                                   const View* new_view,
                                   const View* old_view) OVERRIDE;
 
   // InterfaceImp overrides:
   virtual void OnConnectionEstablished() MOJO_OVERRIDE;
 
   RootNodeManager* root_node_manager_;
 
-  // Id of this connection as assigned by RootNodeManager. Assigned in
-  // OnConnectionEstablished().
-  TransportConnectionId id_;
+  // Id of this connection as assigned by RootNodeManager.
+  const TransportConnectionId id_;
 
   NodeMap node_map_;
 
   ViewMap view_map_;
 
   // The set of nodes that has been communicated to the client.
   NodeIdSet known_nodes_;
 
   // This is the set of nodes the connection can parent nodes to (in addition to
   // any nodes created by this connection). If empty the connection can
   // manipulate any nodes (except for deleting other connections nodes/views).
   // The connection can not delete or move these. If this is set to a non-empty
   // value and all the nodes are deleted (by another connection), then an
   // invalid node is added here to ensure this connection is still constrained.
   NodeIdSet roots_;
 
+  // See description above setter.
+  bool delete_on_connection_error_;
+
   DISALLOW_COPY_AND_ASSIGN(ViewManagerConnection);
 };
 
 #if defined(OS_WIN)
 #pragma warning(pop)
 #endif
 
 }  // namespace service
 }  // namespace view_manager
 }  // namespace mojo
 
 #endif  // MOJO_SERVICES_VIEW_MANAGER_VIEW_MANAGER_CONNECTION_H_