Replace most uses of ViewManagerInitService with client lib ViewManager::Embed() to offer the same …

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/application/application_runner_chromium.h"
 #include "mojo/examples/wm_flow/app/embedder.mojom.h"
 #include "mojo/examples/wm_flow/embedded/embeddee.mojom.h"
 #include "mojo/public/c/system/main.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/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_context.h"
 #include "mojo/services/public/cpp/view_manager/view_manager_delegate.h"
 #include "mojo/services/public/cpp/view_manager/view_observer.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 };
 
 class EmbedderImpl : public mojo::InterfaceImpl<Embedder> {
  public:
   EmbedderImpl() {}
   virtual ~EmbedderImpl() {}
 
  private:
   // Overridden from Embedder:
   virtual void HelloWorld(const mojo::Callback<void()>& callback) OVERRIDE {
     callback.Run();
   }
 
   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 view context.
 class WMFlowApp : public mojo::ApplicationDelegate,
                   public mojo::ViewManagerDelegate,
                   public mojo::ViewObserver {
  public:
-  WMFlowApp()
-      : embed_count_(0),
-        app_(NULL) {}
+  WMFlowApp() : embed_count_(0) {}
   virtual ~WMFlowApp() {}
 
  private:
   // Overridden from Application:
   virtual void Initialize(mojo::ApplicationImpl* app) MOJO_OVERRIDE {
     view_manager_client_factory_.reset(
         new mojo::ViewManagerClientFactory(app->shell(), this));
-    app_ = app;
+    view_manager_context_.reset(new mojo::ViewManagerContext(app));
     OpenNewWindow();
     OpenNewWindow();
     OpenNewWindow();
   }
   virtual bool ConfigureIncomingConnection(
       mojo::ApplicationConnection* connection) MOJO_OVERRIDE {
     connection->AddService(view_manager_client_factory_.get());
     return true;
   }
 
@@ skipping 38 matching lines @@
   virtual void OnViewDestroyed(mojo::View* view) MOJO_OVERRIDE {
     --embed_count_;
     view->RemoveObserver(this);
   }
 
   void HelloBackAck() {
     printf("HelloBack() ack'ed\n");
   }
 
   void OpenNewWindow() {
-    mojo::ViewManagerInitServicePtr init_svc;
-    app_->ConnectToService("mojo:mojo_view_manager", &init_svc);
-    mojo::ServiceProviderPtr sp;
-    init_svc->Embed("mojo:mojo_wm_flow_app", sp.Pass(),
-                    base::Bind(&ConnectCallback));
+    view_manager_context_->Embed("mojo:mojo_wm_flow_app");
   }
 
   int embed_count_;
   scoped_ptr<mojo::ViewManagerClientFactory> view_manager_client_factory_;
   mojo::InterfaceFactoryImpl<EmbedderImpl> embedder_factory_;
+  scoped_ptr<mojo::ViewManagerContext> view_manager_context_;
   EmbeddeePtr embeddee_;
-  mojo::ApplicationImpl* app_;
 
   DISALLOW_COPY_AND_ASSIGN(WMFlowApp);
 };
 
 }  // namespace examples
 
 MojoResult MojoMain(MojoHandle shell_handle) {
   mojo::ApplicationRunnerChromium runner(new examples::WMFlowApp);
   return runner.Run(shell_handle);
 }