| Index: mojo/examples/echo/echo_service.cc
|
| diff --git a/mojo/examples/echo/echo_service.cc b/mojo/examples/echo/echo_service.cc
|
| index 9d4bdd3c11d15d5acc86d2d36e2ff99ba186fcab..8afe1286365604e891d89c69cabf681bbea34fdf 100644
|
| --- a/mojo/examples/echo/echo_service.cc
|
| +++ b/mojo/examples/echo/echo_service.cc
|
| @@ -5,6 +5,8 @@
|
| #include "mojo/examples/echo/echo_service.mojom.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_runner.h"
|
| #include "mojo/public/cpp/application/interface_factory_impl.h"
|
|
|
| namespace mojo {
|
| @@ -32,10 +34,11 @@ class EchoServiceDelegate : public ApplicationDelegate {
|
| };
|
|
|
| } // namespace examples
|
| +} // namespace mojo
|
|
|
| -// static
|
| -ApplicationDelegate* ApplicationDelegate::Create() {
|
| - return new examples::EchoServiceDelegate();
|
| +extern "C" APPLICATION_EXPORT MojoResult CDECL MojoMain(
|
| + MojoHandle shell_handle) {
|
| + mojo::ApplicationRunner app;
|
| + app.take_delegate(new mojo::examples::EchoServiceDelegate);
|
| + return app.Run(shell_handle);
|
| }
|
| -
|
| -} // namespace mojo
|
|
|