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

services/ui/ws/window_manager_access_policy.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_manager_access_policy.h"
 
 #include "services/ui/ws/access_policy_delegate.h"
 #include "services/ui/ws/server_window.h"
 
 namespace ui {
@@ skipping 68 matching lines @@
   // The WindowManager can change the visibility of the WindowManager root.
   const ServerWindow* root = window->GetRoot();
   return root && window->parent() == root;
 }
 
 bool WindowManagerAccessPolicy::CanChangeWindowOpacity(
     const ServerWindow* window) const {
   return WasCreatedByThisClient(window);
 }
 
-bool WindowManagerAccessPolicy::CanSetWindowSurface(
+bool WindowManagerAccessPolicy::CanSetWindowCompositorFrameSink(
     const ServerWindow* window,
-    ui::mojom::SurfaceType surface_type) const {
+    ui::mojom::CompositorFrameSinkType compositor_frame_sink_type) const {
   // Allow the window manager to always provide the underlay. This is important
   // when the window manager is asked to paint the title area to windows it did
   // not create.
-  if (surface_type == mojom::SurfaceType::UNDERLAY)
+  if (compositor_frame_sink_type == mojom::CompositorFrameSinkType::UNDERLAY)
     return true;
 
   if (delegate_->IsWindowRootOfAnotherTreeForAccessPolicy(window))
     return false;
 
   return WasCreatedByThisClient(window) ||
          (delegate_->HasRootForAccessPolicy(window));
 }
 
 bool WindowManagerAccessPolicy::CanSetWindowBounds(
@@ skipping 95 matching lines @@
   return WindowIdFromTransportId(id.id).client_id == client_id_;
 }
 
 bool WindowManagerAccessPolicy::WasCreatedByThisClient(
     const ServerWindow* window) const {
   return window->id().client_id == client_id_;
 }
 
 }  // namespace ws
 }  // namespace ui