| Index: mojo/examples/sample_app/sample_app.cc
|
| diff --git a/mojo/examples/sample_app/sample_app.cc b/mojo/examples/sample_app/sample_app.cc
|
| index ceebd61b88b5fa4541066af6cfd167bc03c53e89..c8190bb2cd23cab6439459388f2c4b6dc28c5e38 100644
|
| --- a/mojo/examples/sample_app/sample_app.cc
|
| +++ b/mojo/examples/sample_app/sample_app.cc
|
| @@ -9,8 +9,10 @@
|
| #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.h"
|
| #include "mojo/public/cpp/system/core.h"
|
| #include "mojo/public/cpp/system/macros.h"
|
| +#include "mojo/public/cpp/system/main.h"
|
| #include "mojo/public/cpp/utility/run_loop.h"
|
| #include "mojo/services/public/interfaces/native_viewport/native_viewport.mojom.h"
|
|
|
| @@ -77,11 +79,7 @@ class SampleApp : public mojo::ApplicationDelegate,
|
|
|
| } // namespace examples
|
|
|
| -namespace mojo {
|
| -
|
| -// static
|
| -ApplicationDelegate* ApplicationDelegate::Create() {
|
| - return new examples::SampleApp();
|
| +MojoResult MojoMain(MojoHandle shell_handle) {
|
| + mojo::ApplicationRunner runner(new examples::SampleApp);
|
| + return runner.Run(shell_handle);
|
| }
|
| -
|
| -} // namespace mojo
|
|
|