Index: mojo/examples/pepper_container_app/pepper_container_app.cc |
diff --git a/mojo/examples/pepper_container_app/pepper_container_app.cc b/mojo/examples/pepper_container_app/pepper_container_app.cc |
index 107f6fdf694e15ed61ac39a263e96d46bc458c0e..e240aeb6428d50fcc4f4dafc0c8e20194db401a5 100644 |
--- a/mojo/examples/pepper_container_app/pepper_container_app.cc |
+++ b/mojo/examples/pepper_container_app/pepper_container_app.cc |
@@ -12,7 +12,9 @@ |
#include "mojo/examples/pepper_container_app/plugin_module.h" |
#include "mojo/examples/pepper_container_app/type_converters.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/interfaces/native_viewport/native_viewport.mojom.h" |
@@ -101,10 +103,13 @@ class PepperContainerApp: public ApplicationDelegate, |
}; |
} // namespace examples |
+} // namespace mojo |
-// static |
-ApplicationDelegate* ApplicationDelegate::Create() { |
- return new examples::PepperContainerApp(); |
+extern "C" APPLICATION_EXPORT MojoResult CDECL MojoMain( |
+ MojoHandle shell_handle) { |
+ mojo::ApplicationRunnerChromium app; |
+ app.take_delegate(make_scoped_delegate( |
+ new mojo::examples::PepperContainerApp)); |
+ return app.Run(shell_handle); |
} |
-} // namespace mojo |