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

ui/views/mus/native_widget_mus.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.
 
 // This has to be before any other includes, else default is picked up.
 // See base/logging for details on this.
 #define NOTIMPLEMENTED_POLICY 5
 
 #include "ui/views/mus/native_widget_mus.h"
 
@@ skipping 513 matching lines @@
  private:
   aura::Window* aura_window_;
   ui::Window* mus_window_;
 
   DISALLOW_COPY_AND_ASSIGN(MusCaptureClient);
 };
 
 ////////////////////////////////////////////////////////////////////////////////
 // NativeWidgetMus, public:
 
-NativeWidgetMus::NativeWidgetMus(internal::NativeWidgetDelegate* delegate,
-                                 ui::Window* window,
-                                 ui::mojom::SurfaceType surface_type)
+NativeWidgetMus::NativeWidgetMus(
+    internal::NativeWidgetDelegate* delegate,
+    ui::Window* window,
+    ui::mojom::CompositorFrameSinkType compositor_frame_sink_type)
     : window_(window),
       last_cursor_(ui::mojom::Cursor::CURSOR_NULL),
       native_widget_delegate_(delegate),
-      surface_type_(surface_type),
+      compositor_frame_sink_type_(compositor_frame_sink_type),
       show_state_before_fullscreen_(ui::mojom::ShowState::DEFAULT),
       ownership_(Widget::InitParams::NATIVE_WIDGET_OWNS_WIDGET),
       content_(new aura::Window(this)),
       last_drop_operation_(ui::DragDropTypes::DRAG_NONE),
       close_widget_factory_(this) {
   window_->set_input_event_handler(this);
   mus_window_observer_ = base::MakeUnique<MusWindowObserver>(this);
 
   // TODO(fsamuel): Figure out lifetime of |window_|.
   aura::SetMusWindow(content_, window_);
@@ skipping 1017 matching lines @@
 
   gfx::Path mask_path;
   native_widget_delegate_->GetHitTestMask(&mask_path);
   // TODO(jamescook): Use the full path for the mask.
   gfx::Rect mask_rect =
       gfx::ToEnclosingRect(gfx::SkRectToRectF(mask_path.getBounds()));
   window_->SetHitTestMask(mask_rect);
 }
 
 }  // namespace views