Enabling Aura-Mus clients to submit frames to Mus.

content/browser/compositor/mus_browser_compositor_output_surface.h

Index: content/browser/compositor/mus_browser_compositor_output_surface.h
diff --git a/content/browser/compositor/mus_browser_compositor_output_surface.h b/content/browser/compositor/mus_browser_compositor_output_surface.h
index 2bb2a5d8f095f0bf2ea5c677650c791db02ce212..476f4524b86dedb482f11f8b28df57f6dbe50a59 100644
--- a/content/browser/compositor/mus_browser_compositor_output_surface.h
+++ b/content/browser/compositor/mus_browser_compositor_output_surface.h
@@ -14,10 +14,16 @@
 #include "gpu/command_buffer/common/mailbox.h"
 #include "gpu/ipc/common/surface_handle.h"
 
+namespace aura {
+class Window;
+class WindowCompositorFrameSink;
+}
+
 namespace gpu {
 class GpuMemoryBufferManager;
 }
 
+// TODO(mfomitchev): Remove once we complete the switch to Aura-Mus.
 namespace ui {
 class Window;
 class WindowCompositorFrameSink;
@@ -32,6 +38,8 @@ class MusBrowserCompositorOutputSurface
     : public GpuBrowserCompositorOutputSurface,
       public cc::CompositorFrameSinkClient {
  public:
+  // TODO(mfomitchev): Remove this constructor once we complete the switch to
+  // Aura-Mus.
   MusBrowserCompositorOutputSurface(
       ui::Window* window,
       scoped_refptr<ContextProviderCommandBuffer> context,
@@ -41,6 +49,15 @@ class MusBrowserCompositorOutputSurface
       std::unique_ptr<display_compositor::CompositorOverlayCandidateValidator>
           overlay_candidate_validator);
 
+  MusBrowserCompositorOutputSurface(
+      aura::Window* window,
+      scoped_refptr<ContextProviderCommandBuffer> context,
+      gpu::GpuMemoryBufferManager* gpu_memory_buffer_manager,
+      scoped_refptr<ui::CompositorVSyncManager> vsync_manager,
+      cc::SyntheticBeginFrameSource* begin_frame_source,
+      std::unique_ptr<display_compositor::CompositorOverlayCandidateValidator>
+          overlay_candidate_validator);
+
   ~MusBrowserCompositorOutputSurface() override;
 
  protected:
@@ -66,8 +83,12 @@ class MusBrowserCompositorOutputSurface
   void FreeResourceId(uint32_t id);
   const gpu::Mailbox& GetMailboxFromResourceId(uint32_t id);
 
+  // TODO(mfomitchev): Remove once we complete the switch to Aura-Mus.
   ui::Window* ui_window_;
   std::unique_ptr<ui::WindowCompositorFrameSink> ui_compositor_frame_sink_;
+
+  aura::Window* window_;
+  std::unique_ptr<aura::WindowCompositorFrameSink> compositor_frame_sink_;
   std::vector<uint32_t> free_resource_ids_;
   std::vector<gpu::Mailbox> mailboxes_;