Mus+Ash: Replace (Server)WindowSurface with (Server)WindowCompositorFrameSink

services/ui/public/cpp/window_tree_client.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/public/cpp/window_tree_client.h"
 
 #include <stddef.h>
 
 #include <string>
 #include <utility>
@@ skipping 331 matching lines @@
                              const mojom::WindowTree::EmbedCallback& callback) {
   DCHECK(tree_);
   tree_->Embed(window_id, std::move(client), flags, callback);
 }
 
 void WindowTreeClient::RequestClose(Window* window) {
   if (window_manager_internal_client_)
     window_manager_internal_client_->WmRequestClose(server_id(window));
 }
 
-void WindowTreeClient::AttachSurface(
+void WindowTreeClient::AttachCompositorFrameSink(
     Id window_id,
-    mojom::SurfaceType type,
-    mojo::InterfaceRequest<cc::mojom::MojoCompositorFrameSink> surface,
+    mojom::CompositorFrameSinkType type,
+    cc::mojom::MojoCompositorFrameSinkRequest compositor_frame_sink,
     cc::mojom::MojoCompositorFrameSinkClientPtr client) {
   DCHECK(tree_);
-  tree_->AttachSurface(window_id, type, std::move(surface), std::move(client));
+  tree_->AttachCompositorFrameSink(
+      window_id, type, std::move(compositor_frame_sink), std::move(client));
 }
 
 void WindowTreeClient::OnWindowSurfaceDetached(
     Id window_id,
     const cc::SurfaceSequence& sequence) {
   DCHECK(tree_);
   tree_->OnWindowSurfaceDetached(window_id, sequence);
 }
 
 void WindowTreeClient::LocalSetCapture(Window* window) {
@@ skipping 1063 matching lines @@
     Window* window,
     const gfx::Vector2d& offset,
     const gfx::Insets& hit_area) {
   if (window_manager_internal_client_) {
     window_manager_internal_client_->SetUnderlaySurfaceOffsetAndExtendedHitArea(
         server_id(window), offset.x(), offset.y(), hit_area);
   }
 }
 
 }  // namespace ui