| Index: mojo/examples/media_viewer/media_viewer.cc
|
| diff --git a/mojo/examples/media_viewer/media_viewer.cc b/mojo/examples/media_viewer/media_viewer.cc
|
| index c886710b15771005fb616c005bafe7252fdad888..82e8427dc4a413ebebd6a1cef03eafb025614dd3 100644
|
| --- a/mojo/examples/media_viewer/media_viewer.cc
|
| +++ b/mojo/examples/media_viewer/media_viewer.cc
|
| @@ -11,7 +11,9 @@
|
| #include "mojo/examples/media_viewer/media_viewer.mojom.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/application/interface_factory_impl.h"
|
| #include "mojo/public/cpp/bindings/interface_impl.h"
|
| #include "mojo/services/public/cpp/view_manager/node.h"
|
| @@ -383,10 +385,11 @@ void NavigatorImpl::Navigate(
|
| }
|
|
|
| } // namespace examples
|
| +} // namespace mojo
|
|
|
| -// static
|
| -ApplicationDelegate* ApplicationDelegate::Create() {
|
| - return new examples::MediaViewer;
|
| +extern "C" APPLICATION_EXPORT MojoResult CDECL MojoMain(
|
| + MojoHandle shell_handle) {
|
| + mojo::ApplicationRunnerChromium app;
|
| + app.take_delegate(make_scoped_delegate(new mojo::examples::MediaViewer));
|
| + return app.Run(shell_handle);
|
| }
|
| -
|
| -} // namespace mojo
|
|
|