Update view_manager and window_manager to make use of content handling.

mojo/services/public/cpp/view_manager/view_manager_client_factory.h

Index: mojo/services/public/cpp/view_manager/view_manager_client_factory.h
diff --git a/mojo/services/public/cpp/view_manager/view_manager_client_factory.h b/mojo/services/public/cpp/view_manager/view_manager_client_factory.h
index a0ea9da0cc461109312bb1e21191e46920574ef3..ab60be9432d1857f79a39a88c804a1683527c5eb 100644
--- a/mojo/services/public/cpp/view_manager/view_manager_client_factory.h
+++ b/mojo/services/public/cpp/view_manager/view_manager_client_factory.h
@@ -11,13 +11,15 @@
 namespace mojo {
 
 class ViewManagerDelegate;
+class Shell;
 
 // Add an instance of this class to an incoming connection to allow it to
 // instantiate ViewManagerClient implementations in response to
 // ViewManagerClient requests.
 class ViewManagerClientFactory : public InterfaceFactory<ViewManagerClient> {
  public:
-  explicit ViewManagerClientFactory(ViewManagerDelegate* delegate);
+  explicit ViewManagerClientFactory(Shell* shell,

[darin (slow to review), 2014/09/04 21:33:51]

nit: no longer need explicit keyword

[Aaron Boodman, 2014/09/05 02:41:31]

blargh, done.

+                                    ViewManagerDelegate* delegate);
   virtual ~ViewManagerClientFactory();
 
   // InterfaceFactory<ViewManagerClient> implementation.
@@ -26,6 +28,7 @@ class ViewManagerClientFactory : public InterfaceFactory<ViewManagerClient> {
       MOJO_OVERRIDE;
 
  private:
+  Shell* shell_;
   ViewManagerDelegate* delegate_;
 };