Nukes ViewManager arg from ViewManagerDelegate::OnEmbed

services/window_manager/window_manager_app.h

 // 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.
 
 #ifndef SERVICES_WINDOW_MANAGER_WINDOW_MANAGER_APP_H_
 #define SERVICES_WINDOW_MANAGER_WINDOW_MANAGER_APP_H_
 
 #include <set>
 
 #include "base/memory/scoped_ptr.h"
@@ skipping 86 matching lines @@
       mojo::ApplicationConnection* connection) override;
 
  private:
   // TODO(sky): rename this. Connections is ambiguous.
   typedef std::set<WindowManagerImpl*> Connections;
   typedef std::set<mojo::Id> RegisteredViewIdSet;
 
   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().
   // TODO(beng): perhaps View should have a property bag.
   void RegisterSubtree(mojo::View* view);
 
   // Recursively invokes Unregister() for |view| and all its descendants.
   void UnregisterSubtree(mojo::View* view);
 
   // Deletes the ViewTarget associated with the hierarchy beneath |id|,
   // and removes from the registry.
   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;
 
   // Overridden from ViewObserver:
   void OnTreeChanged(const ViewObserver::TreeChangeParams& params) override;
   void OnViewDestroying(mojo::View* view) override;
 
   // Overridden from ui::EventHandler:
   void OnEvent(ui::Event* event) override;
@@ skipping 26 matching lines @@
 
   mojo::Shell* shell_;
 
   mojo::InterfaceFactoryImplWithContext<NativeViewportEventDispatcherImpl,
                                         WindowManagerApp>
       native_viewport_event_dispatcher_factory_;
 
   ViewManagerDelegate* wrapped_view_manager_delegate_;
   WindowManagerDelegate* window_manager_delegate_;
 
-  mojo::ViewManager* view_manager_;
   scoped_ptr<mojo::ViewManagerClientFactory> view_manager_client_factory_;
   mojo::View* root_;
 
   scoped_ptr<FocusController> focus_controller_;
   scoped_ptr<CaptureController> capture_controller_;
 
   Connections connections_;
   RegisteredViewIdSet registered_view_id_set_;
 
   mojo::WindowManagerInternalClientPtr window_manager_client_;
 
   ScopedVector<PendingEmbed> pending_embeds_;
 
   scoped_ptr<mojo::ViewManagerClient> view_manager_client_;
 
   scoped_ptr<ViewEventDispatcher> view_event_dispatcher_;
 
   scoped_ptr<mojo::Binding<WindowManagerInternal>> wm_internal_binding_;
 
   DISALLOW_COPY_AND_ASSIGN(WindowManagerApp);
 };
 
 }  // namespace window_manager
 
 #endif  // SERVICES_WINDOW_MANAGER_WINDOW_MANAGER_APP_H_