Nukes ViewManager arg from ViewManagerDelegate::OnEmbed

services/window_manager/window_manager_app.h

Index: services/window_manager/window_manager_app.h
diff --git a/services/window_manager/window_manager_app.h b/services/window_manager/window_manager_app.h
index e866c381ba3b7f23c0dda57db24f7c997afcbf0e..cdd7368bd48efd6a952ddfe176eefd1466e32274 100644
--- a/services/window_manager/window_manager_app.h
+++ b/services/window_manager/window_manager_app.h
@@ -104,6 +104,10 @@ class WindowManagerApp
   struct PendingEmbed;
   class WindowManagerInternalImpl;
 
+  mojo::ViewManager* view_manager() {
+    return root_ ? root_->view_manager() : nullptr;
+  }
+
   // Creates an ViewTarget for every view in the hierarchy beneath |view|,
   // and adds to the registry so that it can be retrieved later via
   // GetViewTargetForViewId().
@@ -118,8 +122,7 @@ class WindowManagerApp
   void Unregister(mojo::View* view);
 
   // Overridden from ViewManagerDelegate:
-  void OnEmbed(mojo::ViewManager* view_manager,
-               mojo::View* root,
+  void OnEmbed(mojo::View* root,
                mojo::ServiceProviderImpl* exported_services,
                scoped_ptr<mojo::ServiceProvider> imported_services) override;
   void OnViewManagerDisconnected(mojo::ViewManager* view_manager) override;
@@ -166,7 +169,6 @@ class WindowManagerApp
   ViewManagerDelegate* wrapped_view_manager_delegate_;
   WindowManagerDelegate* window_manager_delegate_;
 
-  mojo::ViewManager* view_manager_;
   scoped_ptr<mojo::ViewManagerClientFactory> view_manager_client_factory_;
   mojo::View* root_;