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

mojo/services/view_manager/root_node_manager.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/view_manager/root_node_manager.h"
 
 #include "base/logging.h"
 #include "mojo/public/cpp/application/application_connection.h"
 #include "mojo/public/interfaces/application/service_provider.mojom.h"
 #include "mojo/services/public/cpp/input_events/input_events_type_converters.h"
@@ skipping 68 matching lines @@
   connection_map_.erase(connection->id());
   connections_created_by_connect_.erase(connection);
 
   // Notify remaining connections so that they can cleanup.
   for (ConnectionMap::const_iterator i = connection_map_.begin();
        i != connection_map_.end(); ++i) {
     i->second->OnViewManagerServiceImplDestroyed(connection->id());
   }
 }
 
-void RootNodeManager::EmbedRoot(const std::string& url) {
+void RootNodeManager::EmbedRoot(
+    const std::string& url,
+    InterfaceRequest<ServiceProvider> service_provider) {
   if (connection_map_.empty()) {
-    EmbedImpl(kInvalidConnectionId, String::From(url), RootNodeId());
+    EmbedImpl(kInvalidConnectionId, String::From(url), RootNodeId(),
+              service_provider.Pass());
     return;
   }
   ViewManagerServiceImpl* connection = GetConnection(kWindowManagerConnection);
-  connection->client()->Embed(url);
+  connection->client()->Embed(url, service_provider.Pass());
 }
 
-void RootNodeManager::Embed(ConnectionSpecificId creator_id,
-                            const String& url,
-                            Id transport_node_id) {
-  EmbedImpl(creator_id, url, NodeIdFromTransportId(transport_node_id))->
-      set_delete_on_connection_error();
+void RootNodeManager::Embed(
+    ConnectionSpecificId creator_id,
+    const String& url,
+    Id transport_node_id,
+    InterfaceRequest<ServiceProvider> service_provider) {
+  EmbedImpl(creator_id,
+            url,
+            NodeIdFromTransportId(transport_node_id),
+            service_provider.Pass())->set_delete_on_connection_error();
 }
 
 ViewManagerServiceImpl* RootNodeManager::GetConnection(
     ConnectionSpecificId connection_id) {
   ConnectionMap::iterator i = connection_map_.find(connection_id);
   return i == connection_map_.end() ? NULL : i->second;
 }
 
 Node* RootNodeManager::GetNode(const NodeId& id) {
   if (id == root_->id())
@@ skipping 124 matching lines @@
 
 void RootNodeManager::FinishChange() {
   // PrepareForChange/FinishChange should be balanced.
   CHECK(current_change_);
   current_change_ = NULL;
 }
 
 ViewManagerServiceImpl* RootNodeManager::EmbedImpl(
     const ConnectionSpecificId creator_id,
     const String& url,
-    const NodeId& root_id) {
+    const NodeId& root_id,
+    InterfaceRequest<ServiceProvider> service_provider) {
   MessagePipe pipe;
 
-  ServiceProvider* service_provider =
+  ServiceProvider* view_manager_service_provider =
       app_connection_->ConnectToApplication(url)->GetServiceProvider();
-  service_provider->ConnectToService(
+  view_manager_service_provider->ConnectToService(
       ViewManagerServiceImpl::Client::Name_,
       pipe.handle1.Pass());
 
   std::string creator_url;
   ConnectionMap::const_iterator it = connection_map_.find(creator_id);
   if (it != connection_map_.end())
     creator_url = it->second->url();
 
   ViewManagerServiceImpl* connection =
       new ViewManagerServiceImpl(this,
                                  creator_id,
                                  creator_url,
                                  url.To<std::string>(),
-                                 root_id);
+                                 root_id,
+                                 service_provider.Pass());
   WeakBindToPipe(connection, pipe.handle0.Pass());
   connections_created_by_connect_.insert(connection);
   OnConnectionMessagedClient(connection->id());
   return connection;
 }
 
 void RootNodeManager::OnNodeDestroyed(const Node* node) {
   ProcessNodeDeleted(node->id());
 }
 
@@ skipping 16 matching lines @@
   ProcessNodeViewReplaced(node, new_view, old_view);
 }
 
 void RootNodeManager::OnViewInputEvent(const View* view,
                                        const ui::Event* event) {
   DispatchViewInputEventToWindowManager(view, event);
 }
 
 }  // namespace service
 }  // namespace mojo