Index: mojo/examples/demo_launcher/demo_launcher.cc |
diff --git a/mojo/examples/demo_launcher/demo_launcher.cc b/mojo/examples/demo_launcher/demo_launcher.cc |
index 86a1b3db92032cd2d8329241cc8d96db01f6c929..af3005d1b4c3506fa148e1df2f0240aa6fa99903 100644 |
--- a/mojo/examples/demo_launcher/demo_launcher.cc |
+++ b/mojo/examples/demo_launcher/demo_launcher.cc |
@@ -7,7 +7,9 @@ |
#include "base/run_loop.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_chromium.h" |
#include "mojo/services/public/interfaces/view_manager/view_manager.mojom.h" |
namespace mojo { |
@@ -39,10 +41,11 @@ class DemoLauncher : public ApplicationDelegate { |
}; |
} // namespace examples |
+} // namespace mojo |
-// static |
-ApplicationDelegate* ApplicationDelegate::Create() { |
- return new examples::DemoLauncher; |
+extern "C" APPLICATION_EXPORT MojoResult CDECL MojoMain( |
+ MojoHandle shell_handle) { |
+ mojo::ApplicationRunnerChromium app; |
+ app.take_delegate(make_scoped_delegate(new mojo::examples::DemoLauncher)); |
+ return app.Run(shell_handle); |
} |
- |
-} // namespace mojo |