Index: components/view_manager/public/interfaces/view_tree.mojom |
diff --git a/components/view_manager/public/interfaces/view_manager.mojom b/components/view_manager/public/interfaces/view_tree.mojom |
similarity index 91% |
rename from components/view_manager/public/interfaces/view_manager.mojom |
rename to components/view_manager/public/interfaces/view_tree.mojom |
index 18eac2470481871702aec4bc1eea5483eeac8f47..a14555884c1864f3f5cade816d67f890db19d356 100644 |
--- a/components/view_manager/public/interfaces/view_manager.mojom |
+++ b/components/view_manager/public/interfaces/view_tree.mojom |
@@ -42,7 +42,7 @@ enum ErrorCode { |
// and the lower 16 the id assigned by the client. |
// |
// The root view is identified with a connection id of 0, and value of 1. |
-interface ViewManagerService { |
+interface ViewTree { |
// Creates a new view 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). |
// Additionally the connection id (embedded in |view_id|) must match that of |
@@ -112,7 +112,7 @@ interface ViewManagerService { |
// 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 |
+ // Tells the ViewTree that the ViewTreeClient wants to get |
// OnEmbedForDescendant() when EmbedAllowingReembed() is invoked on any |
// descendant Views. |
// |
@@ -125,22 +125,21 @@ interface ViewManagerService { |
// A connection may grant access to a view from another connection by way of |
// the embed functions. The following variants exist: |
// |
- // . Embed: the client supplies the ViewManagerClient to embed. |
+ // . Embed: the client supplies the ViewTreeClient 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. |
+ // a ViewTreeClient from it. |
// |
- // In all cases the new ViewManagerClient is configured with a root of |
- // |view_id|. |
+ // In all cases the new ViewTreeClient 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 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 |
+ // ViewTreeClient being removed. The embedded app is told this by way of |
// OnUnembed(), which is followed by OnViewDeleted() (as the connection no |
// longer has access to the view). |
// |
@@ -152,7 +151,7 @@ interface ViewManagerService { |
// children the children are removed. The one exception is the root |
// 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); |
+ Embed(uint32 view_id, ViewTreeClient client) => (bool success); |
EmbedAllowingReembed(uint32 view_id, URLRequest request) => (bool success); |
SetFocus(uint32 view_id) => (bool success); |
@@ -169,21 +168,21 @@ interface ViewManagerService { |
// 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 { |
+interface ViewTreeClient { |
// 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. |
+ // See Embed() on ViewTree for more details. |tree| will be a handle back to |
+ // the view manager service, unless the connection is to the root connection |
+ // in which case it will be null. |
OnEmbed(uint16 connection_id, |
ViewData root, |
- ViewManagerService? view_manager_service, |
+ ViewTree? tree, |
uint32 focused_view); |
- // Asks the ViewManagerClient that was marked as an embed root for the |
- // ViewManagerClient to embed in |view|. The embed can be disallowed by |
+ // Asks the ViewTreeClient that was marked as an embed root for the |
+ // ViewTreeClient to embed in |view|. The embed can be disallowed by |
// calling the callback with nullptr. |
OnEmbedForDescendant(uint32 view, URLRequest request) => |
- (ViewManagerClient? client); |
+ (ViewTreeClient? client); |
// Invoked when the application embedded at |view| is disconnected. |
OnEmbeddedAppDisconnected(uint32 view); |