Client side name cleanup

mojo/services/public/cpp/view_manager/view_manager.h

Index: mojo/services/public/cpp/view_manager/view_manager.h
diff --git a/mojo/services/public/cpp/view_manager/view_manager.h b/mojo/services/public/cpp/view_manager/view_manager.h
index 36a1c4a7acae1c04fd02f9940ddcb54a713dc547..6ed6e901d38a4d4c34162a2d569b64fa4d763fe0 100644
--- a/mojo/services/public/cpp/view_manager/view_manager.h
+++ b/mojo/services/public/cpp/view_manager/view_manager.h
@@ -8,15 +8,15 @@
 #include <string>
 #include <vector>
 
-#include "mojo/services/public/cpp/view_manager/view_manager_types.h"
+#include "mojo/services/public/cpp/view_manager/types.h"
 
 namespace mojo {
 class Application;
 namespace view_manager {
 
+class Node;
 class View;
 class ViewManagerDelegate;
-class ViewTreeNode;
 
 class ViewManager {
  public:
@@ -27,10 +27,10 @@ class ViewManager {
   virtual const std::string& GetEmbedderURL() const = 0;
 
   // Returns all root nodes known to this connection.
-  virtual const std::vector<ViewTreeNode*>& GetRoots() const = 0;
+  virtual const std::vector<Node*>& GetRoots() const = 0;
 
   // Returns a Node or View known to this connection.
-  virtual ViewTreeNode* GetNodeById(Id id) = 0;
+  virtual Node* GetNodeById(Id id) = 0;
   virtual View* GetViewById(Id id) = 0;
 
  protected: