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

ui/views/mus/native_widget_mus.h

 // 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.
 
 #ifndef UI_VIEWS_MUS_NATIVE_WIDGET_MUS_H_
 #define UI_VIEWS_MUS_NATIVE_WIDGET_MUS_H_
 
 #include <stdint.h>
 
 #include <map>
@@ skipping 58 matching lines @@
 // aura::Window in a hierarchy is created without a delegate by the
 // aura::WindowTreeHost, we must create a child aura::Window in this class
 // (content_) and attach it to the root.
 class VIEWS_MUS_EXPORT NativeWidgetMus
     : public internal::NativeWidgetPrivate,
       public aura::WindowDelegate,
       public aura::WindowTreeHostObserver,
       public aura::client::DragDropDelegate,
       public NON_EXPORTED_BASE(ui::InputEventHandler) {
  public:
-  NativeWidgetMus(internal::NativeWidgetDelegate* delegate,
-                  ui::Window* window,
-                  ui::mojom::SurfaceType surface_type);
+  NativeWidgetMus(
+      internal::NativeWidgetDelegate* delegate,
+      ui::Window* window,
+      ui::mojom::CompositorFrameSinkType compositor_frame_sink_type);
   ~NativeWidgetMus() override;
 
   // Configures the set of properties supplied to the window manager when
   // creating a new Window for a Widget.
   static void ConfigurePropertiesForNewWindow(
       const Widget::InitParams& init_params,
       std::map<std::string, std::vector<uint8_t>>* properties);
 
   // Notifies all widgets the frame constants changed in some way.
   static void NotifyFrameChanged(ui::WindowTreeClient* client);
 
   // Returns the native widget for a ui::Window, or null if there is none.
   static NativeWidgetMus* GetForWindow(ui::Window* window);
 
   // Returns the widget for a ui::Window, or null if there is none.
   static Widget* GetWidgetForWindow(ui::Window* window);
 
-  ui::mojom::SurfaceType surface_type() const { return surface_type_; }
+  ui::mojom::CompositorFrameSinkType compositor_frame_sink_type() const {
+    return compositor_frame_sink_type_;
+  }
   ui::Window* window() { return window_; }
   WindowTreeHostMus* window_tree_host() { return window_tree_host_.get(); }
 
   aura::Window* GetRootWindow();
 
   void OnPlatformWindowClosed();
   void OnActivationChanged(bool active);
 
  protected:
   // Updates the client area in the ui::Window.
@@ skipping 137 matching lines @@
   class MusWindowObserver;
   class MusCaptureClient;
 
   ui::PlatformWindowDelegate* platform_window_delegate() {
     return window_tree_host();
   }
 
   // Returns true if this NativeWidgetMus exists on the window manager side
   // to provide the frame decorations.
   bool is_parallel_widget_in_window_manager() {
-    return surface_type_ == ui::mojom::SurfaceType::UNDERLAY;
+    return compositor_frame_sink_type_ ==
+           ui::mojom::CompositorFrameSinkType::UNDERLAY;
   }
 
   void set_last_cursor(ui::mojom::Cursor cursor) { last_cursor_ = cursor; }
   void SetShowState(ui::mojom::ShowState show_state);
 
   void OnMusWindowVisibilityChanging(ui::Window* window, bool visible);
   void OnMusWindowVisibilityChanged(ui::Window* window, bool visible);
 
   // Propagates the widget hit test mask, if any, to the ui::Window.
   // TODO(jamescook): Wire this through views::Widget so widgets can push
   // updates if needed.
   void UpdateHitTestMask();
 
   ui::Window* window_;
   ui::mojom::Cursor last_cursor_;
 
   internal::NativeWidgetDelegate* native_widget_delegate_;
 
-  const ui::mojom::SurfaceType surface_type_;
+  const ui::mojom::CompositorFrameSinkType compositor_frame_sink_type_;
   ui::mojom::ShowState show_state_before_fullscreen_;
 
   // See class documentation for Widget in widget.h for a note about ownership.
   Widget::InitParams::Ownership ownership_;
 
   // Functions with the same name require the ui::WindowObserver to be in
   // a separate class.
   std::unique_ptr<MusWindowObserver> mus_window_observer_;
 
   // Receives drop events for |window_|.
@@ skipping 18 matching lines @@
   std::unique_ptr<InputMethodMus> input_method_;
 
   base::WeakPtrFactory<NativeWidgetMus> close_widget_factory_;
 
   DISALLOW_COPY_AND_ASSIGN(NativeWidgetMus);
 };
 
 }  // namespace views
 
 #endif  // UI_VIEWS_MUS_NATIVE_WIDGET_MUS_H_