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

mojo/services/html_viewer/html_viewer.cc

Index: mojo/services/html_viewer/html_viewer.cc
diff --git a/mojo/services/html_viewer/html_viewer.cc b/mojo/services/html_viewer/html_viewer.cc
index d147c81728ea3e5455f44f0deed25dbaa73497a5..014f2381c4d8c4642dcd10f6c882cc6817cafade 100644
--- a/mojo/services/html_viewer/html_viewer.cc
+++ b/mojo/services/html_viewer/html_viewer.cc
@@ -9,8 +9,8 @@
 #include "mojo/public/cpp/application/interface_factory_impl.h"
 #include "mojo/services/html_viewer/blink_platform_impl.h"
 #include "mojo/services/html_viewer/html_document_view.h"
-#include "mojo/services/public/cpp/view_manager/node.h"
 #include "mojo/services/public/cpp/view_manager/types.h"
+#include "mojo/services/public/cpp/view_manager/view.h"
 #include "mojo/services/public/cpp/view_manager/view_manager.h"
 #include "mojo/services/public/cpp/view_manager/view_manager_client_factory.h"
 #include "mojo/services/public/cpp/view_manager/view_manager_delegate.h"
@@ -29,7 +29,7 @@ class NavigatorImpl : public InterfaceImpl<Navigator> {
  private:
   // Overridden from Navigator:
   virtual void Navigate(
-      uint32_t node_id,
+      uint32_t view_id,
       NavigationDetailsPtr navigation_details,
       ResponseDetailsPtr response_details) OVERRIDE;
 
@@ -72,14 +72,14 @@ class HTMLViewer : public ApplicationDelegate, public ViewManagerDelegate {
 
   // Overridden from ViewManagerDelegate:
   virtual void OnEmbed(ViewManager* view_manager,
-                       Node* root,
+                       View* root,
                        ServiceProviderImpl* exported_services,
                        scoped_ptr<ServiceProvider> imported_services) OVERRIDE {
     document_view_ = new HTMLDocumentView(
         application_impl_->ConnectToApplication("mojo://mojo_window_manager/")->
             GetServiceProvider(),
         view_manager);
-    document_view_->AttachToNode(root);
+    document_view_->AttachToView(root);
     MaybeLoad();
   }
   virtual void OnViewManagerDisconnected(ViewManager* view_manager) OVERRIDE {
@@ -104,7 +104,7 @@ class HTMLViewer : public ApplicationDelegate, public ViewManagerDelegate {
 };
 
 void NavigatorImpl::Navigate(
-    uint32_t node_id,
+    uint32_t view_id,
     NavigationDetailsPtr navigation_details,
     ResponseDetailsPtr response_details) {
   viewer_->Load(response_details.Pass());