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 499ef709af16d6cbfa5f5435e1e7775edcac8dbb..5518ab308b1d76c07a24bd65b92a3bc5c3857625 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_manager_root.mojom.h"
 #include "components/view_manager/public/interfaces/view_tree.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"
@@ -29,8 +27,6 @@ class ApplicationImpl;
 }
 
 namespace surfaces {
-class DisplayImpl;
-class SurfacesImpl;
 class SurfacesScheduler;
 class SurfacesState;
 }
@@ -45,10 +41,8 @@ class ConnectionManager;
 
 class ViewManagerApp : public mojo::ApplicationDelegate,
                        public ConnectionManagerDelegate,
-                       public mojo::InterfaceFactory<mojo::Surface>,
                        public mojo::InterfaceFactory<mojo::ViewManagerRoot>,
-                       public mojo::InterfaceFactory<mojo::Gpu>,
-                       public surfaces::SurfacesDelegate {
+                       public mojo::InterfaceFactory<mojo::Gpu> {
  public:
   ViewManagerApp();
   ~ViewManagerApp() override;
@@ -82,13 +76,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;
-
   // ViewManager
   mojo::ApplicationImpl* app_impl_;
   scoped_ptr<ConnectionManager> connection_manager_;
@@ -98,7 +85,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);