| Index: mojo/examples/surfaces_app/child_app.cc
|
| diff --git a/mojo/examples/surfaces_app/child_app.cc b/mojo/examples/surfaces_app/child_app.cc
|
| index 215f496caec51e7d54ec69106e69e5013c278de3..ef6ab8d71df794e4947514d6eb868ace5e480b73 100644
|
| --- a/mojo/examples/surfaces_app/child_app.cc
|
| +++ b/mojo/examples/surfaces_app/child_app.cc
|
| @@ -5,7 +5,9 @@
|
| #include "mojo/examples/surfaces_app/child_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_chromium.h"
|
| #include "mojo/public/cpp/bindings/string.h"
|
|
|
| namespace mojo {
|
| @@ -41,10 +43,11 @@ class ChildApp : public ApplicationDelegate, public InterfaceFactory<Child> {
|
| };
|
|
|
| } // namespace examples
|
| +} // namespace mojo
|
|
|
| -// static
|
| -ApplicationDelegate* ApplicationDelegate::Create() {
|
| - return new examples::ChildApp();
|
| +extern "C" APPLICATION_EXPORT MojoResult CDECL MojoMain(
|
| + MojoHandle shell_handle) {
|
| + mojo::ApplicationRunnerChromium app;
|
| + app.take_delegate(make_scoped_delegate(new mojo::examples::ChildApp()));
|
| + return app.Run(shell_handle);
|
| }
|
| -
|
| -} // namespace mojo
|
|
|