Cleanup of ViewManager

mojo/services/view_manager/node_delegate.h

Index: mojo/services/view_manager/node_delegate.h
diff --git a/mojo/services/view_manager/node_delegate.h b/mojo/services/view_manager/node_delegate.h
index 8550e1de49fb092554c071c610bca972474ba626..1079dd88cacf9b99fe567c928f9e4eecdf516dd3 100644
--- a/mojo/services/view_manager/node_delegate.h
+++ b/mojo/services/view_manager/node_delegate.h
@@ -11,20 +11,20 @@ namespace mojo {
 namespace view_manager {
 namespace service {
 
-struct NodeId;
-struct ViewId;
+class Node;
+class View;
 
 class MOJO_VIEW_MANAGER_EXPORT NodeDelegate {
  public:
   // Invoked when the hierarchy has changed.
-  virtual void OnNodeHierarchyChanged(const NodeId& node,
-                                      const NodeId& new_parent,
-                                      const NodeId& old_parent) = 0;
+  virtual void OnNodeHierarchyChanged(const Node* node,
+                                      const Node* new_parent,
+                                      const Node* old_parent) = 0;
 
   // Invoked when the View associated with a node changes.
-  virtual void OnNodeViewReplaced(const NodeId& node,
-                                  const ViewId& new_view_id,
-                                  const ViewId& old_view_id) = 0;
+  virtual void OnNodeViewReplaced(const Node* node,
+                                  const View* new_view,
+                                  const View* old_view) = 0;
 
  protected:
   virtual ~NodeDelegate() {}