mus: Send display-id to client only for the root windows.

components/mus/public/interfaces/window_tree.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 mus.mojom;
 
 import "cc/ipc/surface_id.mojom";
 import "components/mus/public/interfaces/compositor_frame.mojom";
 import "components/mus/public/interfaces/cursor.mojom";
 import "components/mus/public/interfaces/event_matcher.mojom";
@@ skipping 11 matching lines @@
 };
 
 struct WindowData {
   uint32 parent_id;
   uint32 window_id;
   mojo.Rect bounds;
   map<string, array<uint8>> properties;
   // True if this window is visible. The window may not be drawn on screen (see
   // OnWindowParentDrawnStateChanged() for details).
   bool visible;
-  int64 display_id;
 };
 
 enum ErrorCode {
   NONE,
   VALUE_IN_USE,
   ILLEGAL_ARGUMENT,
 };
 
 // Each Window has support for two surfaces. Generally the |DEFAULT| surface
 // is used. The |UNDERLAY| surface is useful if the owner of a window wants to
@@ skipping 233 matching lines @@
 
 // Changes to windows are not sent to the connection that originated the
 // change. For example, if connection 1 changes the bounds of a window by
 // calling SetWindowBounds(), connection 1 does not receive
 // OnWindowBoundsChanged().
 interface WindowTreeClient {
   // Invoked when the client application has been embedded at |root|.
   // See Embed() on WindowTree for more details. |tree| will be a handle back to
   // the window manager service, unless the connection is to the root connection
   // in which case it will be null. |parent_drawn| is true if roots parent is
-  // drawn, see OnParentDrawnStateChanged() for details.
+  // drawn, see OnParentDrawnStateChanged() for details. |display_id| identifies
+  // the display this root window is on.
   OnEmbed(uint16 connection_id,
           WindowData root,
           WindowTree? tree,
+          int64 display_id,
           uint32 focused_window,
           bool parent_drawn);
 
   // Invoked when the application embedded at |window| is disconnected. In other
   // words the embedded app closes the connection to the server. This is called
   // on the connection that created |window| as well as any ancestors that have
   // the embed root policy.
   OnEmbeddedAppDisconnected(uint32 window);
 
   // Sent when another connection is embedded in the Window this connection was
   // previously embedded in. See Embed() for more information.
   OnUnembed(uint32 window);
 
   // Sent when a window loses capture.
   OnLostCapture(uint32 window);
 
   // Called in response to NewTopLevelWindow() successfully completing.
   // |parent_drawn| is true if the parent of the window is drawn, see
-  // OnDrawnStateChanged() for details.
-  OnTopLevelCreated(uint32 change_id, WindowData data, bool parent_drawn);
+  // OnDrawnStateChanged() for details. |display_id| identifies the display this
+  // window is on.
+  OnTopLevelCreated(uint32 change_id,
+                    WindowData data,
+                    int64 display_id,
+                    bool parent_drawn);
 
   // Invoked when a window's bounds have changed.
   OnWindowBoundsChanged(uint32 window,
                         mojo.Rect old_bounds,
                         mojo.Rect new_bounds);
 
   OnClientAreaChanged(uint32 window_id,
                       mojo.Insets new_client_area,
                       array<mojo.Rect> new_additional_client_areas);
 
@@ skipping 82 matching lines @@
   // See description of WindowManager for details.
   GetWindowManager(associated WindowManager& internal);
 };
 
 // Mus provides this interface as a way for clients to connect and obtain a
 // WindowTree handle with a supplied WindowTreeClient handle. The
 // WindowTreeClient has no roots, use NewTopLevelWindow() to create one.
 interface WindowTreeFactory {
   CreateWindowTree(WindowTree& tree_request, WindowTreeClient client);
 };