| Index: mojo/examples/nesting_app/nesting_app.cc
|
| diff --git a/mojo/examples/nesting_app/nesting_app.cc b/mojo/examples/nesting_app/nesting_app.cc
|
| index e8a168a057723428237e6a50871da24f6fbeb598..c3547525101d2b0ed1536735c4ae5acb46184d08 100644
|
| --- a/mojo/examples/nesting_app/nesting_app.cc
|
| +++ b/mojo/examples/nesting_app/nesting_app.cc
|
| @@ -9,7 +9,9 @@
|
| #include "mojo/examples/window_manager/window_manager.mojom.h"
|
| #include "mojo/public/cpp/application/application_connection.h"
|
| #include "mojo/public/cpp/application/application_delegate.h"
|
| +#include "mojo/public/cpp/application/application_runner_chromium.h"
|
| #include "mojo/public/cpp/application/interface_factory_impl.h"
|
| +#include "mojo/public/cpp/system/main.h"
|
| #include "mojo/services/public/cpp/view_manager/view.h"
|
| #include "mojo/services/public/cpp/view_manager/view_manager.h"
|
| #include "mojo/services/public/cpp/view_manager/view_manager_client_factory.h"
|
| @@ -136,10 +138,9 @@ void NavigatorImpl::Navigate(uint32 node_id,
|
| }
|
|
|
| } // namespace examples
|
| +} // namespace mojo
|
|
|
| -// static
|
| -ApplicationDelegate* ApplicationDelegate::Create() {
|
| - return new examples::NestingApp;
|
| +MojoResult MojoMain(MojoHandle shell_handle) {
|
| + mojo::ApplicationRunnerChromium runner(new mojo::examples::NestingApp);
|
| + return runner.Run(shell_handle);
|
| }
|
| -
|
| -} // namespace mojo
|
|
|