| 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 531e14416e5b6d7b7db03c79285b6f795d9ffd7c..74fb2b7344c8fe4d7c42f516e4bff9c0ee4299c6 100644
|
| --- a/mojo/examples/media_viewer/media_viewer.cc
|
| +++ b/mojo/examples/media_viewer/media_viewer.cc
|
| @@ -9,9 +9,11 @@
|
| #include "base/memory/scoped_ptr.h"
|
| #include "base/strings/utf_string_conversions.h"
|
| #include "mojo/examples/media_viewer/media_viewer.mojom.h"
|
| +#include "mojo/public/c/system/main.h"
|
| #include "mojo/public/cpp/application/application_connection.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/application/interface_factory_impl.h"
|
| #include "mojo/public/cpp/bindings/interface_impl.h"
|
| #include "mojo/services/public/cpp/view_manager/view.h"
|
| @@ -384,10 +386,9 @@ void NavigatorImpl::Navigate(
|
| }
|
|
|
| } // namespace examples
|
| +} // namespace mojo
|
|
|
| -// static
|
| -ApplicationDelegate* ApplicationDelegate::Create() {
|
| - return new examples::MediaViewer;
|
| +MojoResult MojoMain(MojoHandle shell_handle) {
|
| + mojo::ApplicationRunnerChromium runner(new mojo::examples::MediaViewer);
|
| + return runner.Run(shell_handle);
|
| }
|
| -
|
| -} // namespace mojo
|
|
|