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 f045d71ad8c075c3de688a938703e560ca69ab79..9f58d05ed32841e954996255e6defeeb961ac4ad 100644 |
--- a/mojo/examples/demo_launcher/demo_launcher.cc |
+++ b/mojo/examples/demo_launcher/demo_launcher.cc |
@@ -5,9 +5,11 @@ |
#include "base/basictypes.h" |
#include "base/bind.h" |
#include "base/run_loop.h" |
+#include "mojo/public/c/system/main.h" |
#include "mojo/public/cpp/application/application_connection.h" |
#include "mojo/public/cpp/application/application_delegate.h" |
#include "mojo/public/cpp/application/application_impl.h" |
+#include "mojo/public/cpp/application/application_runner_chromium.h" |
#include "mojo/public/cpp/application/service_provider_impl.h" |
#include "mojo/public/interfaces/application/service_provider.mojom.h" |
#include "mojo/services/public/interfaces/view_manager/view_manager.mojom.h" |
@@ -43,10 +45,9 @@ class DemoLauncher : public ApplicationDelegate { |
}; |
} // namespace examples |
+} // namespace mojo |
-// static |
-ApplicationDelegate* ApplicationDelegate::Create() { |
- return new examples::DemoLauncher; |
+MojoResult MojoMain(MojoHandle shell_handle) { |
+ mojo::ApplicationRunnerChromium runner(new mojo::examples::DemoLauncher); |
+ return runner.Run(shell_handle); |
} |
- |
-} // namespace mojo |