Client side name cleanup

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

 // 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.
 
 #ifndef MOJO_SERVICES_PUBLIC_CPP_VIEW_MANAGER_VIEW_MANAGER_H_
 #define MOJO_SERVICES_PUBLIC_CPP_VIEW_MANAGER_VIEW_MANAGER_H_
 
 #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:
   // Delegate is owned by the caller.
   static void Create(Application* application, ViewManagerDelegate* delegate);
 
   // Returns the URL of the application that embedded this application.
   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:
   virtual ~ViewManager() {}
 
 };
 
 }  // namespace view_manager
 }  // namespace mojo
 
 #endif  // MOJO_SERVICES_PUBLIC_CPP_VIEW_MANAGER_VIEW_MANAGER_H_