Trigger Node destruction notifications from Node's dtor

mojo/services/view_manager/root_node_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 MOJO_SERVICES_VIEW_MANAGER_ROOT_NODE_MANAGER_H_
 #define MOJO_SERVICES_VIEW_MANAGER_ROOT_NODE_MANAGER_H_
 
 #include <map>
 #include <set>
 
@@ skipping 96 matching lines @@
 
   // Returns the connection by id.
   ViewManagerServiceImpl* GetConnection(ConnectionSpecificId connection_id);
 
   // Returns the Node identified by |id|.
   Node* GetNode(const NodeId& id);
 
   // Returns the View identified by |id|.
   View* GetView(const ViewId& id);
 
-  Node* root() { return &root_; }
+  Node* root() { return root_.get(); }
 
   bool IsProcessingChange() const { return current_change_ != NULL; }
 
   bool is_processing_delete_node() const {
     return current_change_ && current_change_->is_delete_node(); }
 
   // Invoked when a connection messages a client about the change. This is used
   // to avoid sending ServerChangeIdAdvanced() unnecessarily.
   void OnConnectionMessagedClient(ConnectionSpecificId id);
 
   // Returns true if OnConnectionMessagedClient() was invoked for id.
   bool DidConnectionMessageClient(ConnectionSpecificId id) const;
 
   ViewManagerServiceImpl* GetConnectionByCreator(
       ConnectionSpecificId creator_id,
       const std::string& url) const;
 
   void DispatchViewInputEventToWindowManager(const View* view,
                                              const ui::Event* event);
 
   // These functions trivially delegate to all ViewManagerServiceImpls, which in
   // term notify their clients.
+  void ProcessNodeDestroyed(Node* node);
   void ProcessNodeBoundsChanged(const Node* node,
                                 const gfx::Rect& old_bounds,
                                 const gfx::Rect& new_bounds);
   void ProcessNodeHierarchyChanged(const Node* node,
                                    const Node* new_parent,
                                    const Node* old_parent);
   void ProcessNodeReorder(const Node* node,
                           const Node* relative_node,
                           const OrderDirection direction);
   void ProcessNodeViewReplaced(const Node* node,
@@ skipping 30 matching lines @@
   bool IsChangeSource(ConnectionSpecificId connection_id) const {
     return current_change_ && current_change_->connection_id() == connection_id;
   }
 
   // Implementation of the two embed variants.
   ViewManagerServiceImpl* EmbedImpl(ConnectionSpecificId creator_id,
                                    const String& url,
                                    const Array<Id>& node_ids);
 
   // Overridden from NodeDelegate:
+  virtual void OnNodeDestroyed(const Node* node) OVERRIDE;
   virtual void OnNodeHierarchyChanged(const Node* node,
                                       const Node* new_parent,
                                       const Node* old_parent) OVERRIDE;
   virtual void OnNodeBoundsChanged(const Node* node,
                                    const gfx::Rect& old_bounds,
                                    const gfx::Rect& new_bounds) OVERRIDE;
   virtual void OnNodeViewReplaced(const Node* node,
                                   const View* new_view,
                                   const View* old_view) OVERRIDE;
   virtual void OnViewInputEvent(const View* view,
                                 const ui::Event* event) OVERRIDE;
 
   Context context_;
 
   ApplicationConnection* app_connection_;
 
   // ID to use for next ViewManagerServiceImpl.
   ConnectionSpecificId next_connection_id_;
 
   Id next_server_change_id_;
 
   // Set of ViewManagerServiceImpls.
   ConnectionMap connection_map_;
 
   RootViewManager root_view_manager_;
 
   // Root node.
-  Node root_;
+  scoped_ptr<Node> root_;
 
   // Set of ViewManagerServiceImpls created by way of Connect(). These have to
   // be explicitly destroyed.
   std::set<ViewManagerServiceImpl*> connections_created_by_connect_;
 
   // If non-null we're processing a change. The ScopedChange is not owned by us
   // (it's created on the stack by ViewManagerServiceImpl).
   ScopedChange* current_change_;
 
   DISALLOW_COPY_AND_ASSIGN(RootNodeManager);
 };
 
 }  // namespace service
 }  // namespace view_manager
 }  // namespace mojo
 
 #endif  // MOJO_SERVICES_VIEW_MANAGER_ROOT_NODE_MANAGER_H_