Cleanup of ViewManager

mojo/services/view_manager/root_node_manager.cc

 // 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.
 
 #include "mojo/services/view_manager/root_node_manager.h"
 
 #include "base/logging.h"
 #include "mojo/services/view_manager/view_manager_connection.h"
 #include "ui/aura/env.h"
 
@@ skipping 72 matching lines @@
     return &root_;
   ConnectionMap::iterator i = connection_map_.find(id.connection_id);
   return i == connection_map_.end() ? NULL : i->second->GetNode(id);
 }
 
 View* RootNodeManager::GetView(const ViewId& id) {
   ConnectionMap::iterator i = connection_map_.find(id.connection_id);
   return i == connection_map_.end() ? NULL : i->second->GetView(id);
 }
 
-void RootNodeManager::ProcessNodeHierarchyChanged(const NodeId& node,
-                                                  const NodeId& new_parent,
-                                                  const NodeId& old_parent) {
-  // TODO(sky): make a macro for this.
+void RootNodeManager::ProcessNodeHierarchyChanged(const Node* node,
+                                                  const Node* new_parent,
+                                                  const Node* old_parent) {
   for (ConnectionMap::iterator i = connection_map_.begin();
        i != connection_map_.end(); ++i) {
     i->second->ProcessNodeHierarchyChanged(
         node, new_parent, old_parent, next_server_change_id_,
         IsChangeSource(i->first));
   }
 }
 
-void RootNodeManager::ProcessNodeViewReplaced(const NodeId& node,
-                                              const ViewId& new_view_id,
-                                              const ViewId& old_view_id) {
-  // TODO(sky): make a macro for this.
+void RootNodeManager::ProcessNodeViewReplaced(const Node* node,
+                                              const View* new_view,
+                                              const View* old_view) {
   for (ConnectionMap::iterator i = connection_map_.begin();
        i != connection_map_.end(); ++i) {
-    i->second->ProcessNodeViewReplaced(node, new_view_id, old_view_id,
+    i->second->ProcessNodeViewReplaced(node, new_view, old_view,
                                        IsChangeSource(i->first));
   }
 }
 
 void RootNodeManager::ProcessNodeDeleted(const NodeId& node) {
-  // TODO(sky): make a macro for this.
   for (ConnectionMap::iterator i = connection_map_.begin();
        i != connection_map_.end(); ++i) {
     i->second->ProcessNodeDeleted(node, next_server_change_id_,
                                  IsChangeSource(i->first));
   }
 }
 
 void RootNodeManager::ProcessViewDeleted(const ViewId& view) {
-  // TODO(sky): make a macro for this.
   for (ConnectionMap::iterator i = connection_map_.begin();
        i != connection_map_.end(); ++i) {
     i->second->ProcessViewDeleted(view, IsChangeSource(i->first));
   }
 }
 
 void RootNodeManager::PrepareForChange(ViewManagerConnection* connection,
                                        bool is_delete_node) {
   // Should only ever have one change in flight.
   DCHECK_EQ(kNoConnection, change_source_);
   change_source_ = connection->id();
   is_processing_delete_node_ = is_delete_node;
 }
 
 void RootNodeManager::FinishChange(ChangeType change_type) {
   // PrepareForChange/FinishChange should be balanced.
   DCHECK_NE(kNoConnection, change_source_);
   change_source_ = 0;
   is_processing_delete_node_ = false;
   if (change_type == CHANGE_TYPE_ADVANCE_SERVER_CHANGE_ID)
     next_server_change_id_++;
 }
 
-void RootNodeManager::OnNodeHierarchyChanged(const NodeId& node,
-                                             const NodeId& new_parent,
-                                             const NodeId& old_parent) {
+void RootNodeManager::OnNodeHierarchyChanged(const Node* node,
+                                             const Node* new_parent,
+                                             const Node* old_parent) {
   if (!root_view_manager_.in_setup())
     ProcessNodeHierarchyChanged(node, new_parent, old_parent);
 }
 
-void RootNodeManager::OnNodeViewReplaced(const NodeId& node,
-                                         const ViewId& new_view_id,
-                                         const ViewId& old_view_id) {
-  ProcessNodeViewReplaced(node, new_view_id, old_view_id);
+void RootNodeManager::OnNodeViewReplaced(const Node* node,
+                                         const View* new_view,
+                                         const View* old_view) {
+  ProcessNodeViewReplaced(node, new_view, old_view);
 }
 
 }  // namespace service
 }  // namespace view_manager
 }  // namespace mojo