| Index: mojo/examples/compositor_app/compositor_app.cc
|
| diff --git a/mojo/examples/compositor_app/compositor_app.cc b/mojo/examples/compositor_app/compositor_app.cc
|
| index c169d14c1258c66549edb2fcf70ca63bef24c2f2..16a9184cf2fed20cc6559459717a1a299f847752 100644
|
| --- a/mojo/examples/compositor_app/compositor_app.cc
|
| +++ b/mojo/examples/compositor_app/compositor_app.cc
|
| @@ -7,8 +7,10 @@
|
|
|
| #include "base/macros.h"
|
| #include "mojo/examples/compositor_app/compositor_host.h"
|
| +#include "mojo/public/c/system/main.h"
|
| #include "mojo/public/cpp/application/application_delegate.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/geometry/geometry_type_converters.h"
|
| #include "mojo/services/public/interfaces/gpu/gpu.mojom.h"
|
| @@ -60,10 +62,9 @@ class SampleApp : public ApplicationDelegate, public NativeViewportClient {
|
| };
|
|
|
| } // namespace examples
|
| +} // namespace mojo
|
|
|
| -// static
|
| -ApplicationDelegate* ApplicationDelegate::Create() {
|
| - return new examples::SampleApp();
|
| +MojoResult MojoMain(MojoHandle shell_handle) {
|
| + mojo::ApplicationRunnerChromium runner(new mojo::examples::SampleApp);
|
| + return runner.Run(shell_handle);
|
| }
|
| -
|
| -} // namespace mojo
|
|
|