cc/ipc: Move CompositorFrame mojoms

components/mus/ws/server_window_surface.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 COMPONENTS_MUS_WS_SERVER_WINDOW_SURFACE_H_
 #define COMPONENTS_MUS_WS_SERVER_WINDOW_SURFACE_H_
 
 #include <set>
 
 #include "base/macros.h"
+#include "cc/ipc/compositor_frame.mojom.h"
 #include "cc/surfaces/surface_factory.h"
 #include "cc/surfaces/surface_factory_client.h"
 #include "cc/surfaces/surface_id.h"
 #include "cc/surfaces/surface_id_allocator.h"
-#include "components/mus/public/interfaces/compositor_frame.mojom.h"
+#include "components/mus/public/interfaces/surface.mojom.h"
 #include "components/mus/public/interfaces/window_tree.mojom.h"
 #include "components/mus/ws/ids.h"
 #include "mojo/public/cpp/bindings/binding.h"
 
 namespace mus {
 
 class SurfacesState;
 
 namespace ws {
 
 class ServerWindow;
 class ServerWindowSurfaceManager;
 
 // Server side representation of a WindowSurface.
 class ServerWindowSurface : public mojom::Surface,
                             public cc::SurfaceFactoryClient {
  public:
   ServerWindowSurface(ServerWindowSurfaceManager* manager,
                       mojo::InterfaceRequest<mojom::Surface> request,
                       mojom::SurfaceClientPtr client);
 
   ~ServerWindowSurface() override;
 
   const gfx::Size& last_submitted_frame_size() const {
     return last_submitted_frame_size_;
   }
 
   // mojom::Surface:
   void SubmitCompositorFrame(
-      mojom::CompositorFramePtr frame,
+      cc::mojom::CompositorFramePtr frame,
       const SubmitCompositorFrameCallback& callback) override;
 
   const cc::SurfaceId& id() const { return surface_id_; }
 
   // Destroys old surfaces that have been outdated by a new surface.
   void DestroySurfacesScheduledForDestruction();
 
   // Registers this with the SurfaceManager
   void RegisterForBeginFrames();
 
@@ skipping 20 matching lines @@
   bool registered_surface_factory_client_;
 
   DISALLOW_COPY_AND_ASSIGN(ServerWindowSurface);
 };
 
 }  // namespace ws
 
 }  // namespace mus
 
 #endif  // COMPONENTS_MUS_WS_SERVER_WINDOW_SURFACE_H_