Removes ServiceProviders from ViewManager::Embed

components/view_manager/public/interfaces/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.
 
 module mojo;
 
 import "components/view_manager/public/interfaces/surface_id.mojom";
 import "components/view_manager/public/interfaces/view_manager_constants.mojom";
 import "mojo/application/public/interfaces/service_provider.mojom";
 import "network/public/interfaces/url_loader.mojom";
@@ skipping 94 matching lines @@
   // Returns the views comprising the tree starting at |view_id|. |view_id| is
   // the first result in the return value, unless |view_id| is invalid, in which
   // case an empty vector is returned. The views are visited using a depth first
   // search (pre-order).
   GetViewTree(uint32 view_id) => (array<ViewData> views);
 
   // Shows the surface in the specified view.
   SetViewSurfaceId(uint32 view_id, SurfaceId surface_id) => (bool success);
 
   // Tells the ViewManagerService that the ViewManagerClient wants to get
-  // OnWillEmbed() when Embed() is invoked on any descendant Views created by
-  // other ViewManagerClients.
+  // OnEmbedForDescendant() when EmbedAllowingReembed() is invoked on any
+  // descendant Views.
   //
   // See Embed() docs for more details.
   //
   // TODO(sky): this needs to be restricted in some way. Maybe the root can
   // grant this ability?
   SetEmbedRoot();
 
   // A connection may grant access to a view from another connection by way of
   // the embed functions. The following variants exist:
   //
-  // . EmbedRequest: the ViewManager connects to the app at the supplied request
-  //   and asks it for a ViewManagerClient.
-  // . Embed: the client supplies the ViewManagerClient to use.
-  // . EmbedAllowingReembed: similar to EmbedRequest(), but no
-  //   ServiceProviders are supplied. Additionally this version allows an
-  //   EmbedRoot ancestor to call Embed() in this view at a later date.
+  // . Embed: the client supplies the ViewManagerClient to embed.
+  // . EmbedAllowingReembed: walks the view tree for the first embed root
+  //   ancestor and asks it to perform the embed (OnEmbedForDescendant()).
+  //   The embed root ancestor may allow or disallow the request. If there is no
+  //   embed root ancestor ViewManager connects to the application and requests
+  //   a ViewManagerClient from it.
   //
   // In all cases the new ViewManagerClient is configured with a root of
   // |view_id|.
   //
   // The caller must have created |view_id|. If not the request fails and the
   // response is false.
   //
-  // A view may only be a root of one connection at a time. Subsequent calls to
-  // Embed() for the same view result in the view being removed from the
-  // currently embedded app. The embedded app is told this by way of
+  // A view may only have one embedding in it at a time. Subsequent calls to
+  // Embed() for the same view result in the currently embedded
+  // ViewManagerClient being removed. The embedded app is told this by way of
   // OnViewDeleted().
   //
   // The embedder can detect when the embedded app disconnects by way of
   // OnEmbeddedAppDisconnected().
   //
   // When a connection embeds an app the connection no longer has priviledges
   // to access or see any of the children of the view. If the view had existing
   // children the children are removed. The one exception is the root
-  // connection and any embed roots. Embed roots always see the full tree.
-  //
-  // The embed functions call OnWillEmbed() on the first ancestor that has
-  // been set as an embed root.
-  //
-  // |services| encapsulates services offered by the embedder to the embedded
-  // app alongside this Embed() call. |exposed_services| provides a means for
-  // the embedder to connect to services exposed by the embedded app. Note that
-  // if a different app is subsequently embedded at |view_id| the
-  // ServiceProvider connections to its client in the embedded app and any
-  // services it provided are not broken and continue to be valid.
-  EmbedRequest(URLRequest request,
-               uint32 view_id,
-               ServiceProvider&? services,
-               ServiceProvider? exposed_services) => (bool success);
+  // connection and any embed roots. The root always see the full tree, and
+  // embed roots see the complete tree at their embed point.
   Embed(uint32 view_id, ViewManagerClient client) => (bool success);
-  EmbedAllowingReembed(URLRequest request, uint32 view_id) => (bool success);
+  EmbedAllowingReembed(uint32 view_id, URLRequest request) => (bool success);
 
   SetFocus(uint32 view_id) => (bool success);
 };
 
 // Changes to views are not sent to the connection that originated the
 // change. For example, if connection 1 changes the bounds of a view by calling
 // SetBounds(), connection 1 does not receive OnViewBoundsChanged().
 interface ViewManagerClient {
   // Invoked when the client application has been embedded at |root|.
   // See Embed() on ViewManagerService for more details. |view_manager_service|
   // will be a handle back to the view manager service, unless the connection is
   // to the WindowManager in which case it will be null.
   OnEmbed(uint16 connection_id,
-          string embedder_url,
           ViewData root,
           ViewManagerService? view_manager_service,
-          ServiceProvider&? services,
-          ServiceProvider? exposed_services,
           uint32 focused_view);
 
-  // Notifies a ViewManagerClient that an embed is about to happen. The
-  // ViewManagerClient can decide not to allow the embed as well as changing
-  // the ServiceProviders that are exposed as a result of the embed. This is
-  // only invoked once per embed, and is invoked on the first ancestor that has
-  // invoked SetEmbedRoot().
-  OnWillEmbed(uint32 view,
-              ServiceProvider&? services,
-              ServiceProvider? exposed_services) =>
-      (bool proceed_with_embed,
-       ServiceProvider&? services,
-       ServiceProvider? exposed_services);
+  // Asks the ViewManagerClient that was marked as an embed root for the
+  // ViewManagerClient to embed in |view|. The embed can be disallowed by
+  // calling the callback with nullptr.
+  OnEmbedForDescendant(uint32 view, URLRequest request) =>
+      (ViewManagerClient? client);
 
   // Invoked when the application embedded at |view| is disconnected.
   OnEmbeddedAppDisconnected(uint32 view);
 
   // Invoked when a view's bounds have changed.
   OnViewBoundsChanged(uint32 view,
                       mojo.Rect old_bounds,
                       mojo.Rect new_bounds);
 
   // Invoked when the viewport metrics for the view have changed.
@@ skipping 37 matching lines @@
 
   // Invoked when a view property is changed. If this change is a removal,
   // |new_data| is null.
   OnViewSharedPropertyChanged(uint32 view, string name, array<uint8>? new_data);
 
   // Invoked when an event is targeted at the specified view.
   OnViewInputEvent(uint32 view, mojo.Event event) => ();
 
   OnViewFocused(uint32 focused_view_id);
 };