Make Mozart view manager use the new compositor.

services/ui/launcher/launcher_app.h

Index: services/ui/launcher/launcher_app.h
diff --git a/services/ui/launcher/launcher_app.h b/services/ui/launcher/launcher_app.h
index d614956a969719fcdc71cd98cfa2892794b6dd23..b6b5c2d80719baf67fe153b476af389a3b47c6ae 100644
--- a/services/ui/launcher/launcher_app.h
+++ b/services/ui/launcher/launcher_app.h
@@ -9,8 +9,9 @@
 
 #include "mojo/common/tracing_impl.h"
 #include "mojo/public/cpp/application/application_delegate.h"
+#include "mojo/services/gfx/composition/interfaces/compositor.mojom.h"
 #include "mojo/services/native_viewport/interfaces/native_viewport.mojom.h"
-#include "mojo/services/surfaces/interfaces/display.mojom.h"
+#include "mojo/services/ui/views/interfaces/view_manager.mojom.h"
 #include "mojo/services/ui/views/interfaces/view_provider.mojom.h"
 
 namespace launcher {
@@ -25,30 +26,36 @@ class LauncherApp : public mojo::ApplicationDelegate,
 
  private:
   // |ApplicationDelegate|:
-  void Initialize(mojo::ApplicationImpl* app) override;
+  void Initialize(mojo::ApplicationImpl* app_impl) override;
 
   // |NativeViewportEventDispatcher|:
   void OnEvent(mojo::EventPtr event,
                const mojo::Callback<void()>& callback) override;
 
+  void OnCompositorConnectionError();
+  void OnViewManagerConnectionError();
+
   void InitViewport();
   void OnViewportConnectionError();
   void OnViewportCreated(mojo::ViewportMetricsPtr metrics);
   void OnViewportMetricsChanged(mojo::ViewportMetricsPtr metrics);
   void RequestUpdatedViewportMetrics();
 
-  void OnViewManagerConnectionError();
-
   void LaunchClient(std::string app_url);
   void OnClientConnectionError();
   void OnClientViewCreated(mojo::ui::ViewTokenPtr view_token);
 
   void UpdateClientView();
 
+  void Shutdown();
+
   mojo::ApplicationImpl* app_impl_;
   mojo::TracingImpl tracing_;
 
-  mojo::NativeViewportPtr viewport_service_;
+  mojo::gfx::composition::CompositorPtr compositor_;
+  mojo::ui::ViewManagerPtr view_manager_;
+
+  mojo::NativeViewportPtr viewport_;
   mojo::Binding<NativeViewportEventDispatcher>
       viewport_event_dispatcher_binding_;