Mus: Remove CompositorFrameSinkType

services/ui/ws/window_server.cc

Index: services/ui/ws/window_server.cc
diff --git a/services/ui/ws/window_server.cc b/services/ui/ws/window_server.cc
index 7e8d355eb252189a7b3b01dedc4b10f99911a1bf..aaafe893b449a7217c0ad9c67bfd5d9b57c20a66 100644
--- a/services/ui/ws/window_server.cc
+++ b/services/ui/ws/window_server.cc
@@ -775,9 +775,6 @@ void WindowServer::OnGpuServiceInitialized() {
 void WindowServer::OnSurfaceCreated(const cc::SurfaceInfo& surface_info) {
   WindowId window_id(
       WindowIdFromTransportId(surface_info.id().frame_sink_id().client_id()));
-  mojom::CompositorFrameSinkType compositor_frame_sink_type(
-      static_cast<mojom::CompositorFrameSinkType>(
-          surface_info.id().frame_sink_id().sink_id()));
   ServerWindow* window = GetWindow(window_id);
   // If the window doesn't have a parent then we have nothing to propagate.
   if (!window)
@@ -787,7 +784,7 @@ void WindowServer::OnSurfaceCreated(const cc::SurfaceInfo& surface_info) {
   // DisplayCompositorFrameSink may submit a CompositorFrame without
   // creating a CompositorFrameSinkManager.
   window->GetOrCreateCompositorFrameSinkManager()->SetLatestSurfaceInfo(
-      compositor_frame_sink_type, surface_info);
+      surface_info);
 
   // FrameGenerator will add an appropriate reference for the new surface.
   DCHECK(display_manager_->GetDisplayContaining(window));
@@ -801,12 +798,9 @@ void WindowServer::OnSurfaceCreated(const cc::SurfaceInfo& surface_info) {
   if (!window_paint_callback_.is_null())
     window_paint_callback_.Run(window);
 
-  // We only care about propagating default surface IDs.
-  // TODO(fsamuel, sadrul): we should get rid of CompositorFrameSinkTypes.
-  if (compositor_frame_sink_type != mojom::CompositorFrameSinkType::DEFAULT ||
-      !window->parent()) {
+  if (!window->parent())
     return;
-  }
+
   WindowTree* window_tree = GetTreeWithId(window->parent()->id().client_id);
   if (window_tree)
     window_tree->ProcessWindowSurfaceChanged(window, surface_info);