| Index: mojo/examples/dbus_echo/dbus_echo_app.cc
|
| diff --git a/mojo/examples/dbus_echo/dbus_echo_app.cc b/mojo/examples/dbus_echo/dbus_echo_app.cc
|
| index ea18f8b96a8a601bac57bf571a96c4070815b681..024bd0104e898c67b5c33edf94f39ae91ae6c1c9 100644
|
| --- a/mojo/examples/dbus_echo/dbus_echo_app.cc
|
| +++ b/mojo/examples/dbus_echo/dbus_echo_app.cc
|
| @@ -9,9 +9,11 @@
|
| #include "base/logging.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/environment/environment.h"
|
| #include "mojo/public/cpp/system/core.h"
|
| #include "mojo/public/cpp/system/macros.h"
|
| +#include "mojo/public/cpp/system/main.h"
|
| #include "mojo/services/dbus_echo/echo.mojom.h"
|
|
|
| namespace mojo {
|
| @@ -42,10 +44,9 @@ class DBusEchoApp : public ApplicationDelegate {
|
| };
|
|
|
| } // namespace examples
|
| +} // namespace mojo
|
|
|
| -// static
|
| -ApplicationDelegate* ApplicationDelegate::Create() {
|
| - return new examples::DBusEchoApp();
|
| +MojoResult MojoMain(MojoHandle shell_handle) {
|
| + mojo::ApplicationRunner runner(new mojo::examples::DBusEchoApp);
|
| + return runner.Run(shell_handle);
|
| }
|
| -
|
| -} // namespace mojo
|
|
|