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

services/ui/public/cpp/window_tree_client.h

 // 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.
 
 #ifndef SERVICES_UI_PUBLIC_CPP_WINDOW_TREE_CLIENT_H_
 #define SERVICES_UI_PUBLIC_CPP_WINDOW_TREE_CLIENT_H_
 
 #include <stdint.h>
 
 #include <map>
@@ skipping 110 matching lines @@
                         bool visible,
                         mojo::TextInputStatePtr state);
 
   void Embed(Id window_id,
              mojom::WindowTreeClientPtr client,
              uint32_t flags,
              const mojom::WindowTree::EmbedCallback& callback);
 
   void RequestClose(Window* window);
 
-  void AttachSurface(
+  void 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);
 
   void OnWindowSurfaceDetached(Id window_id,
                                const cc::SurfaceSequence& sequence);
 
   // Sets the input capture to |window| without notifying the server.
   void LocalSetCapture(Window* window);
   // Sets focus to |window| without notifying the server.
   void LocalSetFocus(Window* window);
 
@@ skipping 343 matching lines @@
   std::set<Id> drag_entered_windows_;
 
   base::WeakPtrFactory<WindowTreeClient> weak_factory_;
 
   DISALLOW_COPY_AND_ASSIGN(WindowTreeClient);
 };
 
 }  // namespace ui
 
 #endif  // SERVICES_UI_PUBLIC_CPP_WINDOW_TREE_CLIENT_H_