Chromium Code Reviews| 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 513379e6d0fcaf0e7d03291c9b9b0302f19b29d2..2cd9b1824fd6a11f8bff54f61ed3a9118db6f83e 100644 |
| --- a/mojo/examples/compositor_app/compositor_app.cc |
| +++ b/mojo/examples/compositor_app/compositor_app.cc |
| @@ -8,7 +8,9 @@ |
| #include "base/macros.h" |
| #include "mojo/examples/compositor_app/compositor_host.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/geometry/geometry_type_converters.h" |
| #include "mojo/services/public/interfaces/native_viewport/native_viewport.mojom.h" |
| @@ -58,10 +60,10 @@ class SampleApp : public ApplicationDelegate, public NativeViewportClient { |
| }; |
| } // namespace examples |
| +} // namespace mojo |
| -// static |
| -ApplicationDelegate* ApplicationDelegate::Create() { |
| - return new examples::SampleApp(); |
| +extern "C" APPLICATION_EXPORT MojoResult CDECL MojoMain( |
| + MojoHandle shell_handle) { |
| + mojo::ApplicationRunnerChromium runner(new mojo::examples::SampleApp()); |
|
darin (slow to review)
2014/08/18 23:38:18
nit: you seemed to be standardizing on dropping th
tim (not reviewing)
2014/08/19 00:06:29
Done.
|
| + return runner.Run(shell_handle); |
| } |
| - |
| -} // namespace mojo |