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

ash/mus/non_client_frame_controller.cc

 // Copyright 2015 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 "ash/mus/non_client_frame_controller.h"
 
 #include <stdint.h>
 
 #include <memory>
 #include <string>
@@ skipping 204 matching lines @@
   DetachedTitleAreaRenderer* title_area_renderer_ = nullptr;
 
   DISALLOW_COPY_AND_ASSIGN(ImmersiveFullscreenControllerDelegateMus);
 };
 
 class WmNativeWidgetMus : public views::NativeWidgetMus {
  public:
   WmNativeWidgetMus(views::internal::NativeWidgetDelegate* delegate,
                     ui::Window* window,
                     ui::WindowManagerClient* window_manager_client)
-      : NativeWidgetMus(delegate, window, ui::mojom::SurfaceType::UNDERLAY),
+      : NativeWidgetMus(delegate,
+                        window,
+                        ui::mojom::CompositorFrameSinkType::UNDERLAY),
         window_manager_client_(window_manager_client) {}
   ~WmNativeWidgetMus() override {}
 
   // NativeWidgetMus:
   views::NonClientFrameView* CreateNonClientFrameView() override {
     move_event_handler_.reset(new MoveEventHandler(
         window(), window_manager_client_, GetNativeView()));
     if (ShouldRemoveStandardFrame(window()))
       return new EmptyDraggableNonClientFrameView();
     if (GetWindowType(window()) == ui::mojom::WindowType::PANEL)
@@ skipping 221 matching lines @@
   }
 }
 
 void NonClientFrameController::OnWindowDestroyed(ui::Window* window) {
   window_->RemoveObserver(this);
   window_ = nullptr;
 }
 
 }  // namespace mus
 }  // namespace ash