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

mojo/services/view_manager/root_node_manager.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_VIEW_MANAGER_ROOT_NODE_MANAGER_H_
 #define MOJO_SERVICES_VIEW_MANAGER_ROOT_NODE_MANAGER_H_
 
 #include <map>
 #include <set>
 
@@ skipping 65 matching lines @@
   virtual ~RootNodeManager();
 
   // Returns the id for the next ViewManagerServiceImpl.
   ConnectionSpecificId GetAndAdvanceNextConnectionId();
 
   void AddConnection(ViewManagerServiceImpl* connection);
   void RemoveConnection(ViewManagerServiceImpl* connection);
 
   // Establishes the initial client. Similar to Connect(), but the resulting
   // client is allowed to do anything.
-  void EmbedRoot(const std::string& url);
+  void EmbedRoot(const std::string& url,
+                 InterfaceRequest<ServiceProvider> service_provider);
 
   // See description of ViewManagerService::Embed() for details. This assumes
   // |transport_node_id| is valid.
   void Embed(ConnectionSpecificId creator_id,
              const String& url,
-             Id transport_node_id);
+             Id transport_node_id,
+             InterfaceRequest<ServiceProvider> service_provider);
 
   // Returns the connection by id.
   ViewManagerServiceImpl* GetConnection(ConnectionSpecificId connection_id);
 
   // Returns the Node identified by |id|.
   Node* GetNode(const NodeId& id);
 
   // Returns the View identified by |id|.
   View* GetView(const ViewId& id);
 
@@ skipping 66 matching lines @@
 
   // Balances a call to PrepareForChange().
   void FinishChange();
 
   // Returns true if the specified connection originated the current change.
   bool IsChangeSource(ConnectionSpecificId connection_id) const {
     return current_change_ && current_change_->connection_id() == connection_id;
   }
 
   // Implementation of the two embed variants.
-  ViewManagerServiceImpl* EmbedImpl(ConnectionSpecificId creator_id,
-                                    const String& url,
-                                    const NodeId& root_id);
+  ViewManagerServiceImpl* EmbedImpl(
+      ConnectionSpecificId creator_id,
+      const String& url,
+      const NodeId& root_id,
+      InterfaceRequest<ServiceProvider> service_provider);
 
   // Overridden from NodeDelegate:
   virtual void OnNodeDestroyed(const Node* node) OVERRIDE;
   virtual void OnNodeHierarchyChanged(const Node* node,
                                       const Node* new_parent,
                                       const Node* old_parent) OVERRIDE;
   virtual void OnNodeBoundsChanged(const Node* node,
                                    const gfx::Rect& old_bounds,
                                    const gfx::Rect& new_bounds) OVERRIDE;
   virtual void OnNodeViewReplaced(const Node* node,
@@ skipping 25 matching lines @@
   // (it's created on the stack by ViewManagerServiceImpl).
   ScopedChange* current_change_;
 
   DISALLOW_COPY_AND_ASSIGN(RootNodeManager);
 };
 
 }  // namespace service
 }  // namespace mojo
 
 #endif  // MOJO_SERVICES_VIEW_MANAGER_ROOT_NODE_MANAGER_H_