| Index: mojo/examples/aura_demo/view_manager_init.cc
|
| diff --git a/mojo/examples/aura_demo/view_manager_init.cc b/mojo/examples/aura_demo/view_manager_init.cc
|
| index 845f8e1f3aa237eeee55362820dcc87eb65d6f4a..4ca40eccfafd704c3d389bf91edea211aa0e5d82 100644
|
| --- a/mojo/examples/aura_demo/view_manager_init.cc
|
| +++ b/mojo/examples/aura_demo/view_manager_init.cc
|
| @@ -5,7 +5,9 @@
|
| #include "base/basictypes.h"
|
| #include "base/bind.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/services/public/interfaces/view_manager/view_manager.mojom.h"
|
|
|
| namespace mojo {
|
| @@ -37,10 +39,11 @@ class ViewManagerInit : public ApplicationDelegate {
|
| };
|
|
|
| } // namespace examples
|
| +} // namespace mojo
|
|
|
| -// static
|
| -ApplicationDelegate* ApplicationDelegate::Create() {
|
| - return new examples::ViewManagerInit();
|
| +extern "C" APPLICATION_EXPORT MojoResult CDECL MojoMain(
|
| + MojoHandle shell_handle) {
|
| + mojo::ApplicationRunnerChromium app;
|
| + app.take_delegate(make_scoped_delegate(new mojo::examples::ViewManagerInit));
|
| + return app.Run(shell_handle);
|
| }
|
| -
|
| -} // namespace mojo
|
|
|