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

mojo/services/public/interfaces/view_manager/view_manager.mojom

 // 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.
 
+import "mojo/public/interfaces/application/service_provider.mojom"
 import "mojo/services/public/interfaces/geometry/geometry.mojom"
 import "mojo/services/public/interfaces/input_events/input_events.mojom"
 import "mojo/services/public/interfaces/view_manager/view_manager_constants.mojom"
 
 module mojo {
 
 struct NodeData {
   uint32 parent_id;
   uint32 node_id;
   uint32 view_id;
@@ skipping 11 matching lines @@
 // ViewManager by embedding it at an approriate Node.
 interface ViewManagerInitService {
   // Embed the application @ |url| at an appropriate Node.
   // The first time this method is called in the lifetime of a View Manager
   // application instance, the "appropriate Node" is defined as being the
   // service root Node.
   // Subsequent times, implementation of this method is delegated to the
   // application embedded at the service root Node. This application is
   // typically referred to as the "window manager", and will have a specific
   // definition of where within its Node hierarchy to embed an unparented URL.
-  Embed(string url) => (bool success);
+  // See ViewManagerService below for more details about |service_provider|.
+  Embed(string url, ServiceProvider service_provider) => (bool success);
 };
 
 // Nodes and Views are identified by a uint32. The upper 16 bits are the
 // connection id, and the lower 16 the id assigned by the client.
 //
 // The root node is identified with a connection id of 0, and value of 1.
 [Client=ViewManagerClient]
 interface ViewManagerService {
   // Creates a new node with the specified id. It is up to the client to ensure
   // the id is unique to the connection (the id need not be globally unique).
@@ skipping 88 matching lines @@
   // OnNodeDeleted().
   //
   // When a connection embeds an app the connection no longer has priviledges
   // to access or see any of the children of the node. If the node had existing
   // children the children are removed. The one exception is the root
   // connection.
   //
   // If |node_id| is 0, the View Manager delegates determination of what node to
   // embed |url| at to the app embedded at the service root node (i.e. the
   // window manager).
-  Embed(string url, uint32 node_id) => (bool success);
+  // 
+  // |service_provider| encapsulates services offered by the embedder to the
+  // embedded app alongside this Embed() call. It also provides a means for
+  // the embedder to connect to services symmetrically exposed by the embedded
+  // app. Note that if a different app is subsequently embedded at |node_id|
+  // the |service_provider|'s connection to its client in the embedded app and
+  // any services it provided are not broken and continue to be valid.
+  Embed(string url,
+        uint32 node_id,
+        ServiceProvider service_provider) => (bool success);
 
   // TODO(sky): move these to a separate interface when FIFO works.
 
   // Sends OnViewInputEvent() to the owner of the specified view.
   DispatchOnViewInputEvent(uint32 view_id, mojo.Event event);
 };
 
 // Changes to nodes/views are not sent to the connection that originated the
 // change. For example, if connection 1 attaches a view to a node (SetView())
 // connection 1 does not receive OnNodeViewReplaced().
 [Client=ViewManagerService]
 interface ViewManagerClient {
   // Invoked when the client application has been embedded at |root|.
-  OnEmbed(uint16 connection_id, string embedder_url, NodeData root);
+  // See Embed() on ViewManagerService for more details.
+  OnEmbed(uint16 connection_id,
+          string embedder_url,
+          NodeData root,
+          ServiceProvider& service_provider);
 
   // Invoked when a node's bounds have changed.
   OnNodeBoundsChanged(uint32 node, mojo.Rect old_bounds, mojo.Rect new_bounds);
 
   // Invoked when a change is done to the hierarchy. A value of 0 is used to
   // identify a null node. For example, if the old_parent is NULL, 0 is
   // supplied.
   // |nodes| contains any nodes that are that the client has not been told
   // about. This is not sent for hierarchy changes of nodes not known to this
   // client or not attached to the tree.
@@ skipping 29 matching lines @@
   //             removed.
   OnFocusChanged(uint32 gained_focus_id, uint32 lost_focus_id);
 
   // TODO(sky): The following methods represent an interface between the view
   //            manager and the application embedded at the service root node
   //            (i.e. the window manager). These methods are not called on
   //            any other clients. They should be moved to a separate interface
   //            once support for derived FIFOs is landed.
 
   // Requests the window manager create a "top level" node embedding |url|.
-  Embed(string url);
+  Embed(string url, ServiceProvider& service_provider);
 
   // Requests the view manager dispatch the event targeted at |view|.
   DispatchOnViewInputEvent(uint32 view, mojo.Event event);
 };
 
 }