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

mojo/examples/wm_flow/app/app.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 "base/bind.h"
 #include "mojo/examples/wm_flow/app/embedder.mojom.h"
 #include "mojo/examples/wm_flow/embedded/embeddee.mojom.h"
 #include "mojo/public/cpp/application/application_connection.h"
 #include "mojo/public/cpp/application/application_delegate.h"
 #include "mojo/public/cpp/application/application_impl.h"
 #include "mojo/public/cpp/application/connect.h"
 #include "mojo/public/cpp/application/interface_factory_impl.h"
 #include "mojo/public/cpp/application/service_provider_impl.h"
 #include "mojo/public/interfaces/application/service_provider.mojom.h"
-#include "mojo/services/public/cpp/view_manager/node.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"
 #include "mojo/services/public/interfaces/view_manager/view_manager.mojom.h"
 
 namespace examples {
 namespace {
 void ConnectCallback(bool success) {}
 
 const SkColor kColors[] = { SK_ColorRED, SK_ColorGREEN, SK_ColorYELLOW };
@@ skipping 10 matching lines @@
   }
 
   DISALLOW_COPY_AND_ASSIGN(EmbedderImpl);
 };
 
 }  // namespace
 
 // This app starts its life via Connect() rather than by being embed, so it does
 // not start with a connection to the ViewManager service. It has to obtain a
 // connection by connecting to the ViewManagerInit service and asking to be
-// embed without a node context.
+// embed without a view context.
 class WMFlowApp : public mojo::ApplicationDelegate,
                   public mojo::ViewManagerDelegate {
  public:
   WMFlowApp()
       : embed_count_(0),
         view_manager_client_factory_(this) {}
   virtual ~WMFlowApp() {}
 
  private:
   // Overridden from Application:
   virtual void Initialize(mojo::ApplicationImpl* app) MOJO_OVERRIDE {
     mojo::ServiceProviderPtr sp;
     app->ConnectToService("mojo:mojo_view_manager", &init_svc_);
     init_svc_->Embed("mojo:mojo_wm_flow_app", sp.Pass(),
                      base::Bind(&ConnectCallback));
   }
   virtual bool ConfigureIncomingConnection(
       mojo::ApplicationConnection* connection) MOJO_OVERRIDE {
     connection->AddService(&view_manager_client_factory_);
     return true;
   }
 
   void OnConnect(bool success) {}
 
   // Overridden from mojo::ViewManagerDelegate:
   virtual void OnEmbed(
       mojo::ViewManager* view_manager,
-      mojo::Node* root,
+      mojo::View* root,
       mojo::ServiceProviderImpl* exported_services,
       scoped_ptr<mojo::ServiceProvider> imported_services) MOJO_OVERRIDE {
     root->SetColor(kColors[embed_count_++ % arraysize(kColors)]);
 
-    mojo::Node* embed = mojo::Node::Create(view_manager);
+    mojo::View* embed = mojo::View::Create(view_manager);
     root->AddChild(embed);
     gfx::Rect bounds = root->bounds();
     bounds.Inset(25, 25);
     embed->SetBounds(bounds);
 
     scoped_ptr<mojo::ServiceProviderImpl> registry(
         new mojo::ServiceProviderImpl);
     // Expose some services to the embeddee...
     registry->AddService(&embedder_factory_);
     scoped_ptr<mojo::ServiceProvider> imported =
@@ skipping 21 matching lines @@
 }  // namespace examples
 
 namespace mojo {
 
 // static
 ApplicationDelegate* ApplicationDelegate::Create() {
   return new examples::WMFlowApp;
 }
 
 }  // namespace