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

mojo/services/view_manager/view_manager_service_impl.h

Index: mojo/services/view_manager/view_manager_service_impl.h
diff --git a/mojo/services/view_manager/view_manager_service_impl.h b/mojo/services/view_manager/view_manager_service_impl.h
index 78e27380de873fe7296e696629866a2e38ee5914..0aa815a4f9e6950706509fb92987d914edbdaa1f 100644
--- a/mojo/services/view_manager/view_manager_service_impl.h
+++ b/mojo/services/view_manager/view_manager_service_impl.h
@@ -130,52 +130,51 @@ class MOJO_VIEW_MANAGER_EXPORT ViewManagerServiceImpl
 
   void RemoveChildrenAsPartOfEmbed(const NodeId& node_id);
 
-  // Converts Node(s) to NodeData(s) for transport. This assumes all the nodes
+  // Converts Node(s) to ViewData(s) for transport. This assumes all the nodes
   // are valid for the client. The parent of nodes the client is not allowed to
-  // see are set to NULL (in the returned NodeData(s)).
-  Array<NodeDataPtr> NodesToNodeDatas(const std::vector<const Node*>& nodes);
-  NodeDataPtr NodeToNodeData(const Node* node);
+  // see are set to NULL (in the returned ViewData(s)).
+  Array<ViewDataPtr> NodesToViewDatas(const std::vector<const Node*>& nodes);
+  ViewDataPtr NodeToViewData(const Node* node);
 
   // Implementation of GetNodeTree(). Adds |node| to |nodes| and recurses if
   // CanDescendIntoNodeForNodeTree() returns true.
   void GetNodeTreeImpl(const Node* node, std::vector<const Node*>* nodes) const;
 
   // ViewManagerService:
-  virtual void CreateNode(Id transport_node_id,
+  virtual void CreateView(Id transport_view_id,
                           const Callback<void(ErrorCode)>& callback) OVERRIDE;
-  virtual void DeleteNode(Id transport_node_id,
+  virtual void DeleteView(Id transport_view_id,
                           const Callback<void(bool)>& callback) OVERRIDE;
-  virtual void AddNode(Id parent_id,
+  virtual void AddView(Id parent_id,
                        Id child_id,
                        const Callback<void(bool)>& callback) OVERRIDE;
-  virtual void RemoveNodeFromParent(
+  virtual void RemoveViewFromParent(
       Id node_id,
       const Callback<void(bool)>& callback) OVERRIDE;
-  virtual void ReorderNode(Id node_id,
-                           Id relative_node_id,
+  virtual void ReorderView(Id view_id,
+                           Id relative_view_id,
                            OrderDirection direction,
                            const Callback<void(bool)>& callback) OVERRIDE;
-  virtual void GetNodeTree(
-      Id node_id,
-      const Callback<void(Array<NodeDataPtr>)>& callback) OVERRIDE;
-  virtual void SetNodeContents(Id node_id,
+  virtual void GetViewTree(
+      Id view_id,
+      const Callback<void(Array<ViewDataPtr>)>& callback) OVERRIDE;
+  virtual void SetViewContents(Id view_id,
                                ScopedSharedBufferHandle buffer,
                                uint32_t buffer_size,
                                const Callback<void(bool)>& callback) OVERRIDE;
-  virtual void SetFocus(Id node_id,
+  virtual void SetFocus(Id view_id,
                         const Callback<void(bool)> & callback) OVERRIDE;
-  virtual void SetNodeBounds(Id node_id,
+  virtual void SetViewBounds(Id view_id,
                              RectPtr bounds,
                              const Callback<void(bool)>& callback) OVERRIDE;
-  virtual void SetNodeVisibility(Id transport_node_id,
+  virtual void SetViewVisibility(Id view_id,
                                  bool visible,
                                  const Callback<void(bool)>& callback) OVERRIDE;
   virtual void Embed(const String& url,
-                     Id transport_node_id,
+                     Id view_id,
                      ServiceProviderPtr service_provider,
                      const Callback<void(bool)>& callback) OVERRIDE;
-  virtual void DispatchOnNodeInputEvent(Id transport_node_id,
-                                        EventPtr event) OVERRIDE;
+  virtual void DispatchOnViewInputEvent(Id view_id, EventPtr event) OVERRIDE;
 
   // InterfaceImpl:
   virtual void OnConnectionEstablished() MOJO_OVERRIDE;