Index: mojo/examples/compositor_app/compositor_app.cc |
diff --git a/mojo/examples/compositor_app/compositor_app.cc b/mojo/examples/compositor_app/compositor_app.cc |
index fd66b90306a1a46963d3802ad53226dff52893d4..e44fc12f7b1a8529b2ddab095b3161d65f07464d 100644 |
--- a/mojo/examples/compositor_app/compositor_app.cc |
+++ b/mojo/examples/compositor_app/compositor_app.cc |
@@ -8,7 +8,9 @@ |
#include "base/macros.h" |
#include "mojo/examples/compositor_app/compositor_host.h" |
#include "mojo/public/cpp/application/application_delegate.h" |
+#include "mojo/public/cpp/application/application_export.h" |
#include "mojo/public/cpp/application/application_impl.h" |
+#include "mojo/public/cpp/application/application_runner_chromium.h" |
#include "mojo/public/cpp/gles2/gles2.h" |
#include "mojo/public/cpp/system/core.h" |
#include "mojo/services/public/cpp/geometry/geometry_type_converters.h" |
@@ -60,10 +62,11 @@ class SampleApp : public ApplicationDelegate, public NativeViewportClient { |
}; |
} // namespace examples |
+} // namespace mojo |
-// static |
-ApplicationDelegate* ApplicationDelegate::Create() { |
- return new examples::SampleApp(); |
+extern "C" APPLICATION_EXPORT MojoResult CDECL MojoMain( |
+ MojoHandle shell_handle) { |
+ mojo::ApplicationRunnerChromium app; |
+ app.take_delegate(make_scoped_delegate(new mojo::examples::SampleApp())); |
+ return app.Run(shell_handle); |
} |
- |
-} // namespace mojo |