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 9792f76e1788b06c52f969fcacedb4025ba764e4..5186c47b94ed18013006f65b6781735b528294d7 100644
--- a/mojo/services/window_manager/window_manager_app.h
+++ b/mojo/services/window_manager/window_manager_app.h
@@ -42,7 +42,7 @@ class WindowManagerApp : public ApplicationDelegate,
                          public aura::client::FocusChangeObserver,
                          public aura::client::ActivationChangeObserver {
  public:
-  WindowManagerApp();
+  explicit WindowManagerApp(view_manager::ViewManagerDelegate* delegate);
   virtual ~WindowManagerApp();
 
   void AddConnection(WindowManagerServiceImpl* connection);
@@ -56,15 +56,15 @@ class WindowManagerApp : public ApplicationDelegate,
 
   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;
@@ -97,6 +97,8 @@ class WindowManagerApp : public ApplicationDelegate,
   // and removes from the registry.
   void UnregisterSubtree(view_manager::Id id);
 
+  view_manager::ViewManagerDelegate* wrapped_delegate_;
+
   view_manager::ViewManager* view_manager_;
   view_manager::Node* root_;