Index: mojo/examples/embedded_app/embedded_app.cc |
diff --git a/mojo/examples/embedded_app/embedded_app.cc b/mojo/examples/embedded_app/embedded_app.cc |
index ead8817d4d9c01d976a340be39ae07ddd89f2238..bf8eecdc572aebd894a846ea9f79ea03f96b0e52 100644 |
--- a/mojo/examples/embedded_app/embedded_app.cc |
+++ b/mojo/examples/embedded_app/embedded_app.cc |
@@ -9,7 +9,9 @@ |
#include "base/strings/string_number_conversions.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/public/cpp/application/interface_factory_impl.h" |
#include "mojo/services/public/cpp/view_manager/node.h" |
#include "mojo/services/public/cpp/view_manager/node_observer.h" |
@@ -169,10 +171,11 @@ void NavigatorImpl::Navigate(uint32 node_id, |
} |
} // namespace examples |
+} // namespace mojo |
-// static |
-ApplicationDelegate* ApplicationDelegate::Create() { |
- return new examples::EmbeddedApp; |
+extern "C" APPLICATION_EXPORT MojoResult CDECL MojoMain( |
+ MojoHandle shell_handle) { |
+ mojo::ApplicationRunnerChromium app; |
+ app.take_delegate(make_scoped_delegate(new mojo::examples::EmbeddedApp)); |
+ return app.Run(shell_handle); |
} |
- |
-} // namespace mojo |