Mus: surfaces::CompositorFrameSink => DisplayCompositorFrameSink

services/ui/ws/frame_generator.h

 // Copyright 2016 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_WS_FRAME_GENERATOR_H_
 #define SERVICES_UI_WS_FRAME_GENERATOR_H_
 
 #include <memory>
 #include <unordered_map>
 
@@ skipping 13 matching lines @@
 class RenderPass;
 class SurfaceId;
 }
 
 namespace gpu {
 class GpuChannelHost;
 }
 
 namespace ui {
 
-namespace surfaces {
-class CompositorFrameSink;
-}
-
 class DisplayCompositor;
+class DisplayCompositorFrameSink;
 
 namespace ws {
 
 namespace test {
 class FrameGeneratorTest;
 }
 
 class FrameGeneratorDelegate;
 class ServerWindow;
 class ServerWindowSurface;
@@ skipping 62 matching lines @@
 
   // ServerWindowObserver implementation.
   void OnWindowDestroying(ServerWindow* window) override;
 
   FrameGeneratorDelegate* delegate_;
   scoped_refptr<DisplayCompositor> display_compositor_;
   cc::FrameSinkId frame_sink_id_;
   cc::SurfaceSequenceGenerator surface_sequence_generator_;
   scoped_refptr<gpu::GpuChannelHost> gpu_channel_;
 
-  std::unique_ptr<surfaces::CompositorFrameSink> compositor_frame_sink_;
+  std::unique_ptr<DisplayCompositorFrameSink> compositor_frame_sink_;
   gfx::AcceleratedWidget widget_ = gfx::kNullAcceleratedWidget;
 
   // The region that needs to be redrawn next time the compositor frame is
   // generated.
   gfx::Rect dirty_rect_;
   base::Timer draw_timer_;
   bool frame_pending_ = false;
   bool may_contain_video_ = false;
   struct SurfaceDependency {
     cc::LocalFrameId local_frame_id;
     cc::SurfaceSequence sequence;
   };
   std::unordered_map<cc::FrameSinkId, SurfaceDependency, cc::FrameSinkIdHash>
       dependencies_;
 
   base::WeakPtrFactory<FrameGenerator> weak_factory_;
 
   DISALLOW_COPY_AND_ASSIGN(FrameGenerator);
 };
 
 }  // namespace ws
 
 }  // namespace ui
 
 #endif  // SERVICES_UI_WS_FRAME_GENERATOR_H_