A new WM bootstrap flow

mojo/services/window_manager/window_manager_app.h

Index: mojo/services/window_manager/window_manager_app.h
diff --git a/mojo/services/window_manager/window_manager_app.h b/mojo/services/window_manager/window_manager_app.h
index bcd74db30ccfcd613961aaa99b45acd67d1ea57e..310dbcc97165ff673a1e970b7ed7cd42c9878235 100644
--- a/mojo/services/window_manager/window_manager_app.h
+++ b/mojo/services/window_manager/window_manager_app.h
@@ -48,7 +48,7 @@ class WindowManagerApp
       public InterfaceFactoryWithContext<WindowManagerServiceImpl,
                                          WindowManagerApp> {
  public:
-  WindowManagerApp();
+  explicit WindowManagerApp(view_manager::ViewManagerDelegate* delegate);
   virtual ~WindowManagerApp();
 
   void AddConnection(WindowManagerServiceImpl* connection);
@@ -62,15 +62,15 @@ class WindowManagerApp
 
   bool IsReady() const;
 
- private:
-  typedef std::set<WindowManagerServiceImpl*> Connections;
-  typedef std::map<view_manager::Id, aura::Window*> NodeIdToWindowMap;
-
   // Overridden from ApplicationDelegate:
   virtual void Initialize(ApplicationImpl* impl) MOJO_OVERRIDE;
   virtual bool ConfigureIncomingConnection(ApplicationConnection* connection)
       MOJO_OVERRIDE;
 
+ private:
+  typedef std::set<WindowManagerServiceImpl*> Connections;
+  typedef std::map<view_manager::Id, aura::Window*> NodeIdToWindowMap;
+
   // Overridden from view_manager::ViewManagerDelegate:
   virtual void OnRootAdded(view_manager::ViewManager* view_manager,
                            view_manager::Node* root) MOJO_OVERRIDE;
@@ -103,6 +103,8 @@ class WindowManagerApp
   // and removes from the registry.
   void UnregisterSubtree(view_manager::Id id);
 
+  view_manager::ViewManagerDelegate* wrapped_delegate_;
+
   view_manager::ViewManager* view_manager_;
   view_manager::ViewManagerClientFactory view_manager_client_factory_;
   view_manager::Node* root_;