Update view_manager and window_manager to make use of content handling.

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/c/system/main.h"
 #include "mojo/public/cpp/application/application_connection.h"
 #include "mojo/public/cpp/application/application_delegate.h"
@@ skipping 35 matching lines @@
 // 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),
-        view_manager_client_factory_(this),
         app_(NULL) {}
   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;
     OpenNewWindow();
     OpenNewWindow();
     OpenNewWindow();
   }
   virtual bool ConfigureIncomingConnection(
       mojo::ApplicationConnection* connection) MOJO_OVERRIDE {
-    connection->AddService(&view_manager_client_factory_);
+    connection->AddService(view_manager_client_factory_.get());
     return true;
   }
 
   void OnConnect(bool success) {}
 
   // Overridden from mojo::ViewManagerDelegate:
   virtual void OnEmbed(
       mojo::ViewManager* view_manager,
       mojo::View* root,
       mojo::ServiceProviderImpl* exported_services,
@@ skipping 39 matching lines @@
 
   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));
   }
 
   int embed_count_;
-  mojo::ViewManagerClientFactory view_manager_client_factory_;
+  scoped_ptr<mojo::ViewManagerClientFactory> view_manager_client_factory_;
   mojo::InterfaceFactoryImpl<EmbedderImpl> embedder_factory_;
   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);
 }