| Index: mojo/examples/aura_demo/aura_demo.cc
|
| diff --git a/mojo/examples/aura_demo/aura_demo.cc b/mojo/examples/aura_demo/aura_demo.cc
|
| index 97b530c1c7e4310a653435372ff0181bee9a6513..e272bf492916ed784b4fff3bdd6acc6797eda078 100644
|
| --- a/mojo/examples/aura_demo/aura_demo.cc
|
| +++ b/mojo/examples/aura_demo/aura_demo.cc
|
| @@ -12,6 +12,9 @@
|
| #include "mojo/aura/window_tree_host_mojo_delegate.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/system/core.h"
|
| #include "mojo/services/public/cpp/view_manager/node.h"
|
| #include "mojo/services/public/cpp/view_manager/view.h"
|
| @@ -200,10 +203,11 @@ class AuraDemo : public ApplicationDelegate,
|
| };
|
|
|
| } // namespace examples
|
| +} // namespace mojo
|
|
|
| -// static
|
| -ApplicationDelegate* ApplicationDelegate::Create() {
|
| - return new examples::AuraDemo();
|
| +extern "C" APPLICATION_EXPORT MojoResult CDECL MojoMain(
|
| + MojoHandle shell_handle) {
|
| + mojo::ApplicationRunnerChromium app;
|
| + app.take_delegate(make_scoped_delegate(new mojo::examples::AuraDemo()));
|
| + return app.Run(shell_handle);
|
| }
|
| -
|
| -} // namespace mojo
|
|
|