Index: mojo/examples/sample_app/sample_app.cc |
diff --git a/mojo/examples/sample_app/sample_app.cc b/mojo/examples/sample_app/sample_app.cc |
index c60e873ff1815241b25126761e1fb615f57295ea..ccadf265a92d6e44eeb0ebc8f15c536943868f74 100644 |
--- a/mojo/examples/sample_app/sample_app.cc |
+++ b/mojo/examples/sample_app/sample_app.cc |
@@ -8,7 +8,9 @@ |
#include "mojo/examples/sample_app/gles2_client_impl.h" |
#include "mojo/public/cpp/application/application_connection.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.h" |
#include "mojo/public/cpp/gles2/gles2.h" |
#include "mojo/public/cpp/system/core.h" |
#include "mojo/public/cpp/system/macros.h" |
@@ -79,11 +81,9 @@ class SampleApp : public mojo::ApplicationDelegate, |
} // namespace examples |
-namespace mojo { |
- |
-// static |
-ApplicationDelegate* ApplicationDelegate::Create() { |
- return new examples::SampleApp(); |
+extern "C" APPLICATION_EXPORT MojoResult CDECL MojoMain( |
+ MojoHandle shell_handle) { |
+ mojo::ApplicationRunner app; |
+ app.take_delegate(new examples::SampleApp); |
+ return app.Run(shell_handle); |
} |
- |
-} // namespace mojo |