Trigger Node destruction notifications from Node's dtor

mojo/services/view_manager/view_manager_service_impl.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_SERVICE_IMPL_H_
 #define MOJO_SERVICES_VIEW_MANAGER_VIEW_MANAGER_SERVICE_IMPL_H_
 
 #include <set>
 #include <string>
 #include <vector>
 
 #include "base/basictypes.h"
 #include "base/compiler_specific.h"
 #include "base/containers/hash_tables.h"
 #include "mojo/services/public/interfaces/view_manager/view_manager.mojom.h"
 #include "mojo/services/view_manager/ids.h"
-#include "mojo/services/view_manager/node_delegate.h"
 #include "mojo/services/view_manager/view_manager_export.h"
 
 namespace gfx {
 class Rect;
 }
 
 namespace mojo {
 namespace view_manager {
 namespace service {
 
 class Node;
 class RootNodeManager;
 class View;
 
 #if defined(OS_WIN)
 // Equivalent of NON_EXPORTED_BASE which does not work with the template snafu
 // below.
 #pragma warning(push)
 #pragma warning(disable : 4275)
 #endif
 
 // Manages a connection from the client.
 class MOJO_VIEW_MANAGER_EXPORT ViewManagerServiceImpl
-    : public InterfaceImpl<ViewManagerService>,
-      public NodeDelegate {
+    : public InterfaceImpl<ViewManagerService> {
  public:
   ViewManagerServiceImpl(RootNodeManager* root_node_manager,
                          ConnectionSpecificId creator_id,
                          const std::string& creator_url,
                          const std::string& url);
   virtual ~ViewManagerServiceImpl();
 
   // Used to mark this connection as originating from a call to
   // ViewManagerService::Connect(). When set OnConnectionError() deletes |this|.
   void set_delete_on_connection_error() { delete_on_connection_error_ = true; }
@@ skipping 156 matching lines @@
                              const Callback<void(bool)>& callback) OVERRIDE;
   virtual void SetNodeVisibility(Id transport_node_id,
                                  bool visible,
                                  const Callback<void(bool)>& callback) OVERRIDE;
   virtual void Embed(const mojo::String& url,
                      mojo::Array<uint32_t> node_ids,
                      const mojo::Callback<void(bool)>& callback) OVERRIDE;
   virtual void DispatchOnViewInputEvent(Id transport_view_id,
                                         EventPtr event) OVERRIDE;
 
-  // Overridden from NodeDelegate:
-  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;
-
   // InterfaceImp overrides:
   virtual void OnConnectionEstablished() MOJO_OVERRIDE;
 
   RootNodeManager* root_node_manager_;
 
   // Id of this connection as assigned by RootNodeManager.
   const ConnectionSpecificId id_;
 
   // URL this connection was created for.
   const std::string url_;
 
   // ID of the connection that created us. If 0 it indicates either we were
   // created by the root, or the connection that created us has been destroyed.
   ConnectionSpecificId creator_id_;
 
   // The URL of the app that embedded the app this connection was created for.
   const std::string creator_url_;
 
+  // The nodes and views created by this connection. This connection owns these
+  // objects.
   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(ViewManagerServiceImpl);
 };
 
 #if defined(OS_WIN)
 #pragma warning(pop)
 #endif
 
 }  // namespace service
 }  // namespace view_manager
 }  // namespace mojo
 
 #endif  // MOJO_SERVICES_VIEW_MANAGER_VIEW_MANAGER_SERVICE_IMPL_H_