Client side name cleanup

mojo/examples/image_viewer/image_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 <algorithm>
 
 #include "base/strings/string_tokenizer.h"
 #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"
 #include "third_party/skia/include/core/SkBitmap.h"
 #include "ui/gfx/codec/png_codec.h"
 
 namespace mojo {
 namespace examples {
 
 class ImageViewer;
 
 class LaunchableConnection : public InterfaceImpl<launcher::Launchable> {
@@ skipping 72 matching lines @@
 
  private:
   // 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);
     if (!bitmap_.isNull())
       DrawBitmap();
   }
 
   void DrawBitmap() {
     if (content_view_)
       content_view_->SetContents(bitmap_);
@@ skipping 11 matching lines @@
 }
 
 }  // namespace examples
 
 // static
 Application* Application::Create() {
   return new examples::ImageViewer;
 }
 
 }  // namespace mojo