Mus+Ash: propagate Surface ID to parents

services/ui/public/cpp/window.h

Index: services/ui/public/cpp/window.h
diff --git a/services/ui/public/cpp/window.h b/services/ui/public/cpp/window.h
index af2aae43276df0a635ac536d80c230c204e35ead..57859ea2fc3ed3b9f35c3bf34595d3d8aeb4c005 100644
--- a/services/ui/public/cpp/window.h
+++ b/services/ui/public/cpp/window.h
@@ -14,6 +14,7 @@
 #include "mojo/public/cpp/bindings/array.h"
 #include "services/shell/public/interfaces/interface_provider.mojom.h"
 #include "services/ui/common/types.h"
+#include "services/ui/public/cpp/surface_id_handler.h"
 #include "services/ui/public/interfaces/mus_constants.mojom.h"
 #include "services/ui/public/interfaces/window_tree.mojom.h"
 #include "ui/gfx/geometry/insets.h"
@@ -27,6 +28,7 @@ namespace ui {
 
 class InputEventHandler;
 class ServiceProviderImpl;
+class SurfaceIdHandler;
 class WindowObserver;
 class WindowSurface;
 class WindowSurfaceBinding;
@@ -162,6 +164,10 @@ class Window {
     input_event_handler_ = input_event_handler;
   }
 
+  void set_surface_id_handler(SurfaceIdHandler* surface_id_handler) {
+    surface_id_handler_ = surface_id_handler;
+  }
+
   // Observation.
   void AddObserver(WindowObserver* observer);
   void RemoveObserver(WindowObserver* observer);
@@ -309,6 +315,7 @@ class Window {
   void LocalSetPredefinedCursor(mojom::Cursor cursor_id);
   void LocalSetSharedProperty(const std::string& name,
                               const std::vector<uint8_t>* data);
+  void LocalSetSurfaceId(std::unique_ptr<SurfaceInfo> surface_info);
 
   // Notifies this winodw that its stacking position has changed.
   void NotifyWindowStackingChanged();
@@ -356,6 +363,7 @@ class Window {
 
   base::ObserverList<WindowObserver> observers_;
   InputEventHandler* input_event_handler_;
+  SurfaceIdHandler* surface_id_handler_;
 
   gfx::Rect bounds_;
   gfx::Insets client_area_;
@@ -393,6 +401,8 @@ class Window {
 
   std::map<const void*, Value> prop_map_;
 
+  std::unique_ptr<SurfaceInfo> surface_info_;
+
   DISALLOW_COPY_AND_ASSIGN(Window);
 };