Rename Node to View in the View Manager mojom & client lib. Service TBD.

mojo/services/view_manager/test_change_tracker.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/test_change_tracker.h"
 
 #include "base/strings/string_util.h"
 #include "base/strings/stringprintf.h"
 #include "mojo/common/common_type_converters.h"
 #include "mojo/services/public/cpp/geometry/geometry_type_converters.h"
@@ skipping 73 matching lines @@
 
 std::string ChangeNodeDescription(const std::vector<Change>& changes) {
   if (changes.size() != 1)
     return std::string();
   std::vector<std::string> node_strings(changes[0].nodes.size());
   for (size_t i = 0; i < changes[0].nodes.size(); ++i)
     node_strings[i] = "[" + changes[0].nodes[i].ToString() + "]";
   return JoinString(node_strings, ',');
 }
 
-TestNode NodeDataToTestNode(const NodeDataPtr& data) {
+TestNode ViewDataToTestNode(const ViewDataPtr& data) {
   TestNode node;
   node.parent_id = data->parent_id;
-  node.node_id = data->node_id;
+  node.node_id = data->view_id;
   return node;
 }
 
-void NodeDatasToTestNodes(const Array<NodeDataPtr>& data,
+void ViewDatasToTestNodes(const Array<ViewDataPtr>& data,
                           std::vector<TestNode>* test_nodes) {
   for (size_t i = 0; i < data.size(); ++i)
-    test_nodes->push_back(NodeDataToTestNode(data[i]));
+    test_nodes->push_back(ViewDataToTestNode(data[i]));
 }
 
 Change::Change()
     : type(CHANGE_TYPE_EMBED),
       connection_id(0),
       node_id(0),
       node_id2(0),
       node_id3(0),
       event_action(0),
       direction(ORDER_DIRECTION_ABOVE) {
 }
 
 Change::~Change() {
 }
 
 TestChangeTracker::TestChangeTracker()
     : delegate_(NULL) {
 }
 
 TestChangeTracker::~TestChangeTracker() {
 }
 
 void TestChangeTracker::OnEmbed(ConnectionSpecificId connection_id,
                                 const String& creator_url,
-                                NodeDataPtr root) {
+                                ViewDataPtr root) {
   Change change;
   change.type = CHANGE_TYPE_EMBED;
   change.connection_id = connection_id;
   change.creator_url = creator_url;
-  change.nodes.push_back(NodeDataToTestNode(root));
+  change.nodes.push_back(ViewDataToTestNode(root));
   AddChange(change);
 }
 
 void TestChangeTracker::OnNodeBoundsChanged(Id node_id,
                                             RectPtr old_bounds,
                                             RectPtr new_bounds) {
   Change change;
   change.type = CHANGE_TYPE_NODE_BOUNDS_CHANGED;
   change.node_id = node_id;
   change.bounds = old_bounds.To<gfx::Rect>();
   change.bounds2 = new_bounds.To<gfx::Rect>();
   AddChange(change);
 }
 
 void TestChangeTracker::OnNodeHierarchyChanged(Id node_id,
                                                Id new_parent_id,
                                                Id old_parent_id,
-                                               Array<NodeDataPtr> nodes) {
+                                               Array<ViewDataPtr> nodes) {
   Change change;
   change.type = CHANGE_TYPE_NODE_HIERARCHY_CHANGED;
   change.node_id = node_id;
   change.node_id2 = new_parent_id;
   change.node_id3 = old_parent_id;
-  NodeDatasToTestNodes(nodes, &change.nodes);
+  ViewDatasToTestNodes(nodes, &change.nodes);
   AddChange(change);
 }
 
 void TestChangeTracker::OnNodeReordered(Id node_id,
                                         Id relative_node_id,
                                         OrderDirection direction) {
   Change change;
   change.type = CHANGE_TYPE_NODE_REORDERED;
   change.node_id = node_id;
   change.node_id2 = relative_node_id;
@@ skipping 30 matching lines @@
 }
 
 std::string TestNode::ToString() const {
   return base::StringPrintf("node=%s parent=%s",
                             NodeIdToString(node_id).c_str(),
                             NodeIdToString(parent_id).c_str());
 }
 
 }  // namespace service
 }  // namespace mojo