Mandoline: Allow submitting CompositorFrames directly to mojo::Views

components/view_manager/view_manager_app.h

Index: components/view_manager/view_manager_app.h
diff --git a/components/view_manager/view_manager_app.h b/components/view_manager/view_manager_app.h
index c8bd7fbc654728a1771d5e17ea03ca8f3007634c..fbdc7ae7b9d8bf3fd28a4a0b94547da031b155cc 100644
--- a/components/view_manager/view_manager_app.h
+++ b/components/view_manager/view_manager_app.h
@@ -11,10 +11,8 @@
 #include "cc/surfaces/surface_manager.h"
 #include "components/view_manager/connection_manager_delegate.h"
 #include "components/view_manager/public/interfaces/gpu.mojom.h"
-#include "components/view_manager/public/interfaces/surfaces.mojom.h"
 #include "components/view_manager/public/interfaces/view_tree.mojom.h"
 #include "components/view_manager/public/interfaces/view_tree_host.mojom.h"
-#include "components/view_manager/surfaces/surfaces_delegate.h"
 #include "mojo/application/public/cpp/app_lifetime_helper.h"
 #include "mojo/application/public/cpp/application_delegate.h"
 #include "mojo/application/public/cpp/interface_factory.h"
@@ -30,8 +28,6 @@ class ApplicationImpl;
 }
 
 namespace surfaces {
-class DisplayImpl;
-class SurfacesImpl;
 class SurfacesScheduler;
 class SurfacesState;
 }
@@ -46,10 +42,8 @@ class ConnectionManager;
 
 class ViewManagerApp : public mojo::ApplicationDelegate,
                        public ConnectionManagerDelegate,
-                       public mojo::InterfaceFactory<mojo::Surface>,
                        public mojo::InterfaceFactory<mojo::ViewTreeHostFactory>,
                        public mojo::InterfaceFactory<mojo::Gpu>,
-                       public surfaces::SurfacesDelegate,
                        public mojo::ViewTreeHostFactory {
  public:
   ViewManagerApp();
@@ -85,13 +79,6 @@ class ViewManagerApp : public mojo::ApplicationDelegate,
   void Create(mojo::ApplicationConnection* connection,
               mojo::InterfaceRequest<mojo::Gpu> request) override;
 
-  // InterfaceFactory<Surface> implementation.
-  void Create(mojo::ApplicationConnection* connection,
-              mojo::InterfaceRequest<mojo::Surface> request) override;
-
-  // SurfacesDelegat implementation.
-  void OnSurfaceConnectionClosed(surfaces::SurfacesImpl* surface) override;
-
   // mojo::ViewTreeHostFactory implementation.
   void CreateViewTreeHost(mojo::InterfaceRequest<mojo::ViewTreeHost> host,
                           mojo::ViewTreeHostClientPtr host_client,
@@ -106,7 +93,6 @@ class ViewManagerApp : public mojo::ApplicationDelegate,
   bool is_headless_;
 
   // Surfaces
-  std::set<surfaces::SurfacesImpl*> surfaces_;
   scoped_refptr<surfaces::SurfacesState> surfaces_state_;
 
   DISALLOW_COPY_AND_ASSIGN(ViewManagerApp);