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

mojo/services/view_manager/view_manager_service_impl.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_VIEW_MANAGER_SERVICE_IMPL_H_
 #define MOJO_SERVICES_VIEW_MANAGER_VIEW_MANAGER_SERVICE_IMPL_H_
 
 #include <set>
 #include <string>
 #include <vector>
@@ skipping 28 matching lines @@
 
 // Manages a connection from the client.
 class MOJO_VIEW_MANAGER_EXPORT ViewManagerServiceImpl
     : public InterfaceImpl<ViewManagerService>,
       public AccessPolicyDelegate {
  public:
   ViewManagerServiceImpl(RootNodeManager* root_node_manager,
                          ConnectionSpecificId creator_id,
                          const std::string& creator_url,
                          const std::string& url,
-                         const NodeId& root_id);
+                         const NodeId& root_id,
+                         InterfaceRequest<ServiceProvider> service_provider);
   virtual ~ViewManagerServiceImpl();
 
   // Used to mark this connection as originating from a call to
   // ViewManagerService::Connect(). When set OnConnectionError() deletes |this|.
   void set_delete_on_connection_error() { delete_on_connection_error_ = true; }
 
   ConnectionSpecificId id() const { return id_; }
   ConnectionSpecificId creator_id() const { return creator_id_; }
   const std::string& url() const { return url_; }
 
@@ skipping 75 matching lines @@
   // to |nodes|, marks |node| as known and recurses.
   void GetUnknownNodesFrom(const Node* node, std::vector<const Node*>* nodes);
 
   // Removes |node| and all its descendants from |known_nodes_|. This does not
   // recurse through nodes that were created by this connection. All nodes owned
   // by this connection are added to |local_nodes|.
   void RemoveFromKnown(const Node* node, std::vector<Node*>* local_nodes);
 
   // Adds |node_id| to the set of roots this connection knows about. The caller
   // should have verified |node_id| is not among the roots of this connection.
-  void AddRoot(const NodeId& node_id);
+  void AddRoot(const NodeId& node_id,
+               InterfaceRequest<ServiceProvider> service_provider);
 
   // Removes |node_id| from the set of roots this connection knows about.
   void RemoveRoot(const NodeId& node_id);
 
   void RemoveChildrenAsPartOfEmbed(const NodeId& node_id);
 
   // Converts Node(s) to NodeData(s) for transport. This assumes all the nodes
   // are valid for the client. The parent of nodes the client is not allowed to
   // see are set to NULL (in the returned NodeData(s)).
   Array<NodeDataPtr> NodesToNodeDatas(const std::vector<const Node*>& nodes);
@@ skipping 35 matching lines @@
   virtual void SetFocus(Id node_id,
                         const Callback<void(bool)> & callback) OVERRIDE;
   virtual void SetNodeBounds(Id node_id,
                              RectPtr bounds,
                              const Callback<void(bool)>& callback) OVERRIDE;
   virtual void SetNodeVisibility(Id transport_node_id,
                                  bool visible,
                                  const Callback<void(bool)>& callback) OVERRIDE;
   virtual void Embed(const String& url,
                      Id transport_node_id,
+                     ServiceProviderPtr service_provider,
                      const Callback<void(bool)>& callback) OVERRIDE;
   virtual void DispatchOnViewInputEvent(Id transport_view_id,
                                         EventPtr event) OVERRIDE;
 
   // InterfaceImpl:
   virtual void OnConnectionEstablished() MOJO_OVERRIDE;
 
   // AccessPolicyDelegate:
   virtual const base::hash_set<Id>& GetRootsForAccessPolicy() const OVERRIDE;
   virtual bool IsNodeKnownForAccessPolicy(const Node* node) const OVERRIDE;
@@ skipping 29 matching lines @@
   // Embed() is invoked the id of the node is added to this set for the child
   // connection. The connection Embed() was invoked on (the parent) doesn't
   // directly track which connections are attached to which of its nodes. That
   // information can be found by looking through the |roots_| of all
   // connections.
   NodeIdSet roots_;
 
   // See description above setter.
   bool delete_on_connection_error_;
 
+  InterfaceRequest<ServiceProvider> service_provider_;
+
   DISALLOW_COPY_AND_ASSIGN(ViewManagerServiceImpl);
 };
 
 #if defined(OS_WIN)
 #pragma warning(pop)
 #endif
 
 }  // namespace service
 }  // namespace mojo
 
 #endif  // MOJO_SERVICES_VIEW_MANAGER_VIEW_MANAGER_SERVICE_IMPL_H_