Cleanup of ViewManager

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 "base/basictypes.h"
@@ skipping 64 matching lines @@
   View* GetView(const ViewId& id);
 
   Node* root() { return &root_; }
 
   bool IsProcessingChange() const { return change_source_ != 0; }
 
   bool is_processing_delete_node() const { return is_processing_delete_node_; }
 
   // These functions trivially delegate to all ViewManagerConnections, which in
   // term notify their clients.
-  void ProcessNodeHierarchyChanged(const NodeId& node,
-                                   const NodeId& new_parent,
-                                   const NodeId& old_parent);
-  void ProcessNodeViewReplaced(const NodeId& node,
-                               const ViewId& new_view_id,
-                               const ViewId& old_view_id);
+  void ProcessNodeHierarchyChanged(const Node* node,
+                                   const Node* new_parent,
+                                   const Node* old_parent);
+  void ProcessNodeViewReplaced(const Node* node,
+                               const View* new_view_id,
+                               const View* old_view_id);
   void ProcessNodeDeleted(const NodeId& node);
   void ProcessViewDeleted(const ViewId& view);
 
  private:
   // Used to setup any static state needed by RootNodeManager.
   struct Context {
     Context();
     ~Context();
   };
 
   typedef std::map<TransportConnectionId, ViewManagerConnection*> ConnectionMap;
 
   // Invoked when a particular connection is about to make a change.
   // Subsequently followed by FinishChange() once the change is done.
   //
   // Changes should never nest, meaning each PrepareForChange() must be
   // balanced with a call to FinishChange() with no PrepareForChange()
   // in between.
   void PrepareForChange(ViewManagerConnection* connection, bool is_delete_node);
 
   // Balances a call to PrepareForChange().
   void FinishChange(ChangeType change_type);
 
   // Returns true if the specified connection originated the current change.
   bool IsChangeSource(TransportConnectionId connection_id) const {
     return connection_id == change_source_;
   }
 
   // Overriden from NodeDelegate:
-  virtual void OnNodeHierarchyChanged(const NodeId& node,
-                                      const NodeId& new_parent,
-                                      const NodeId& old_parent) OVERRIDE;
-  virtual void OnNodeViewReplaced(const NodeId& node,
-                                  const ViewId& new_view_id,
-                                  const ViewId& old_view_id) OVERRIDE;
+  virtual void OnNodeHierarchyChanged(const Node* node,
+                                      const Node* new_parent,
+                                      const Node* old_parent) OVERRIDE;
+  virtual void OnNodeViewReplaced(const Node* node,
+                                  const View* new_view,
+                                  const View* old_view) OVERRIDE;
 
   Context context_;
 
   // ID to use for next ViewManagerConnection.
   TransportConnectionId next_connection_id_;
 
   TransportChangeId next_server_change_id_;
 
   // Set of ViewManagerConnections.
   ConnectionMap connection_map_;
@@ skipping 10 matching lines @@
   Node root_;
 
   DISALLOW_COPY_AND_ASSIGN(RootNodeManager);
 };
 
 }  // namespace service
 }  // namespace view_manager
 }  // namespace mojo
 
 #endif  // MOJO_SERVICES_VIEW_MANAGER_ROOT_NODE_MANAGER_H_