Client side name cleanup

mojo/examples/html_viewer/html_viewer.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/public/cpp/application/application.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_delegate.h"
-#include "mojo/services/public/cpp/view_manager/view_manager_types.h"
-#include "mojo/services/public/cpp/view_manager/view_tree_node.h"
 #include "mojo/services/public/interfaces/launcher/launcher.mojom.h"
 
 namespace mojo {
 namespace examples {
 
 class HTMLViewer;
 
 class LaunchableConnection : public InterfaceImpl<launcher::Launchable> {
  public:
   explicit LaunchableConnection(HTMLViewer* viewer) : viewer_(viewer) {}
@@ skipping 47 matching lines @@
   friend class LaunchableConnection;
 
   // Overridden from Application:
   virtual void Initialize() OVERRIDE {
     AddService<LaunchableConnection>(this);
     view_manager::ViewManager::Create(this, this);
   }
 
   // Overridden from view_manager::ViewManagerDelegate:
   virtual void OnRootAdded(view_manager::ViewManager* view_manager,
-                           view_manager::ViewTreeNode* root) OVERRIDE {
+                           view_manager::Node* root) OVERRIDE {
     content_view_ = view_manager::View::Create(view_manager);
     root->SetActiveView(content_view_);
     content_view_->SetColor(SK_ColorRED);
   }
 
   view_manager::View* content_view_;
 
   DISALLOW_COPY_AND_ASSIGN(HTMLViewer);
 };
 
 void LaunchableConnection::UpdateView() {
   viewer_->content_view_->SetColor(SK_ColorGREEN);
 }
 
 }
 
 // static
 Application* Application::Create() {
   return new examples::HTMLViewer;
 }
 
 }