Pass ServiceProvider thru ViewManagerService::Embed() allowing embedder & embeddee to expose servic…

mojo/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 MOJO_SERVICES_WINDOW_MANAGER_WINDOW_MANAGER_APP_H_
 #define MOJO_SERVICES_WINDOW_MANAGER_WINDOW_MANAGER_APP_H_
 
 #include <set>
 
 #include "base/memory/scoped_ptr.h"
@@ skipping 52 matching lines @@
   // 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<Id, aura::Window*> NodeIdToWindowMap;
 
   // Overridden from ViewManagerDelegate:
-  virtual void OnEmbed(ViewManager* view_manager, Node* root) MOJO_OVERRIDE;
+  virtual void OnEmbed(
+      ViewManager* view_manager,
+      Node* root,
+      ExportedServiceRegistry* exported_services,
+      scoped_ptr<ServiceProvider> imported_services) MOJO_OVERRIDE;
   virtual void OnViewManagerDisconnected(
       ViewManager* view_manager) MOJO_OVERRIDE;
 
   // Overridden from NodeObserver:
   virtual void OnTreeChanged(
       const NodeObserver::TreeChangeParams& params) MOJO_OVERRIDE;
+  virtual void OnNodeDestroyed(Node* node) MOJO_OVERRIDE;
 
   // Overridden from WindowTreeHostMojoDelegate:
   virtual void CompositorContentsChanged(const SkBitmap& bitmap) MOJO_OVERRIDE;
 
   // Overridden from aura::client::FocusChangeObserver:
   virtual void OnWindowFocused(aura::Window* gained_focus,
                                aura::Window* lost_focus) MOJO_OVERRIDE;
 
   // Overridden from aura::client::ActivationChangeObserver:
   virtual void OnWindowActivated(aura::Window* gained_active,
@@ skipping 28 matching lines @@
 
   Connections connections_;
   NodeIdToWindowMap node_id_to_window_map_;
 
   DISALLOW_COPY_AND_ASSIGN(WindowManagerApp);
 };
 
 }  // namespace mojo
 
 #endif  // MOJO_SERVICES_WINDOW_MANAGER_WINDOW_MANAGER_APP_H_