Mus+Ash: Unify CompositorFrameSinks

services/ui/ws/window_tree.cc

 // 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.
 
 #include "services/ui/ws/window_tree.h"
 
 #include <stddef.h>
 
 #include <utility>
 
@@ skipping 1336 matching lines @@
 void WindowTree::SetWindowOpacity(uint32_t change_id,
                                   Id window_id,
                                   float opacity) {
   client()->OnChangeCompleted(
       change_id, SetWindowOpacity(ClientWindowId(window_id), opacity));
 }
 
 void WindowTree::AttachCompositorFrameSink(
     Id transport_window_id,
     mojom::CompositorFrameSinkType type,
-    mojo::InterfaceRequest<cc::mojom::MojoCompositorFrameSink> surface,
+    cc::mojom::MojoCompositorFrameSinkRequest compositor_frame_sink,
     cc::mojom::MojoCompositorFrameSinkClientPtr client) {
   ServerWindow* window =
       GetWindowByClientId(ClientWindowId(transport_window_id));
   const bool success =
       window && access_policy_->CanSetWindowCompositorFrameSink(window, type);
   if (!success) {
     DVLOG(1) << "request to AttachCompositorFrameSink failed";
     return;
   }
-  window->CreateCompositorFrameSink(type, std::move(surface),
+  window->CreateCompositorFrameSink(type, gfx::kNullAcceleratedWidget, nullptr,
+                                    nullptr, std::move(compositor_frame_sink),
                                     std::move(client));
 }
 
 void WindowTree::OnWindowSurfaceDetached(Id transport_window_id,
                                          const cc::SurfaceSequence& sequence) {
   ServerWindow* window =
       GetWindowByClientId(ClientWindowId(transport_window_id));
   if (!window)
     return;
   window_server_->GetDisplayCompositor()->ReturnSurfaceReference(sequence);
@@ skipping 566 matching lines @@
   client()->OnCompleteDrop(client_window_id.id, event_flags, cursor_offset,
                            effect_bitmask, callback);
 }
 
 void WindowTree::PerformOnDragDropDone() {
   client()->OnDragDropDone();
 }
 
 }  // namespace ws
 }  // namespace ui