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

mojo/services/window_manager/window_manager_app.cc

 // 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.
 
 #include "mojo/services/window_manager/window_manager_app.h"
 
 #include "base/message_loop/message_loop.h"
 #include "base/stl_util.h"
 #include "mojo/aura/aura_init.h"
 #include "mojo/aura/window_tree_host_mojo.h"
@@ skipping 132 matching lines @@
 bool WindowManagerApp::ConfigureIncomingConnection(
     ApplicationConnection* connection) {
   connection->AddService(&window_manager_service_factory_);
   connection->AddService(&view_manager_client_factory_);
   return true;
 }
 
 ////////////////////////////////////////////////////////////////////////////////
 // WindowManagerApp, ViewManagerDelegate implementation:
 
-void WindowManagerApp::OnEmbed(ViewManager* view_manager, Node* root) {
+void WindowManagerApp::OnEmbed(ViewManager* view_manager,
+                               Node* root,
+                               ServiceProviderImpl* exported_services,
+                               scoped_ptr<ServiceProvider> imported_services) {
   DCHECK(!view_manager_ && !root_);
   view_manager_ = view_manager;
   root_ = root;
   root_->AddObserver(this);
 
   window_tree_host_.reset(new WindowTreeHostMojo(root_, this));
 
   RegisterSubtree(root_->id(), window_tree_host_->window());
 
   capture_client_.reset(
       new wm::ScopedCaptureClient(window_tree_host_->window()));
   wm::FocusController* focus_controller =
       new wm::FocusController(new WMFocusRules);
   activation_client_ = focus_controller;
   focus_client_.reset(focus_controller);
 
   focus_client_->AddObserver(this);
   activation_client_->AddObserver(this);
 
-  if (wrapped_delegate_)
-    wrapped_delegate_->OnEmbed(view_manager, root);
+  if (wrapped_delegate_) {
+    wrapped_delegate_->OnEmbed(view_manager, root, exported_services,
+                               imported_services.Pass());
+  }
 
   for (Connections::const_iterator it = connections_.begin();
        it != connections_.end(); ++it) {
     (*it)->NotifyReady();
   }
 }
 
 void WindowManagerApp::OnViewManagerDisconnected(
     ViewManager* view_manager) {
   DCHECK_EQ(view_manager_, view_manager);
   if (wrapped_delegate_)
     wrapped_delegate_->OnViewManagerDisconnected(view_manager);
-  root_->RemoveObserver(this);
-  root_ = NULL;
   view_manager_ = NULL;
   base::MessageLoop::current()->Quit();
 }
 
 ////////////////////////////////////////////////////////////////////////////////
 // WindowManagerApp, NodeObserver implementation:
 
 void WindowManagerApp::OnTreeChanged(
     const NodeObserver::TreeChangeParams& params) {
   DCHECK_EQ(params.receiver, root_);
   DCHECK(params.old_parent || params.new_parent);
   if (!params.target)
     return;
 
   if (params.new_parent) {
     if (node_id_to_window_map_.find(params.target->id()) ==
         node_id_to_window_map_.end()) {
       NodeIdToWindowMap::const_iterator it =
           node_id_to_window_map_.find(params.new_parent->id());
       DCHECK(it != node_id_to_window_map_.end());
       RegisterSubtree(params.target->id(), it->second);
     }
   } else if (params.old_parent) {
     UnregisterSubtree(params.target->id());
   }
 }
 
+void WindowManagerApp::OnNodeDestroyed(Node* node) {
+  root_ = NULL;
+  window_tree_host_.reset();
+}
+
 ////////////////////////////////////////////////////////////////////////////////
 // WindowManagerApp, WindowTreeHostMojoDelegate implementation:
 
 void WindowManagerApp::CompositorContentsChanged(const SkBitmap& bitmap) {
   // We draw nothing.
   NOTREACHED();
 }
 
 ////////////////////////////////////////////////////////////////////////////////
 // WindowManagerApp, aura::client::FocusChangeObserver implementation:
@@ skipping 46 matching lines @@
   NodeIdToWindowMap::iterator it = node_id_to_window_map_.find(id);
   DCHECK(it != node_id_to_window_map_.end());
   scoped_ptr<aura::Window> window(it->second);
   node_id_to_window_map_.erase(it);
   Node::Children::const_iterator child = node->children().begin();
   for (; child != node->children().end(); ++child)
     UnregisterSubtree((*child)->id());
 }
 
 }  // namespace mojo