| OLD | NEW |
| 1 // Copyright 2015 The Chromium Authors. All rights reserved. | 1 // Copyright 2015 The Chromium Authors. All rights reserved. |
| 2 // Use of this source code is governed by a BSD-style license that can be | 2 // Use of this source code is governed by a BSD-style license that can be |
| 3 // found in the LICENSE file. | 3 // found in the LICENSE file. |
| 4 | 4 |
| 5 #include "base/at_exit.h" | 5 #include "base/at_exit.h" |
| 6 #include "media/mojo/services/mojo_media_application.h" | 6 #include "media/mojo/services/mojo_media_application.h" |
| 7 #include "mojo/logging/init_logging.h" | 7 #include "mojo/logging/init_logging.h" |
| 8 #include "mojo/public/c/system/main.h" | 8 #include "mojo/public/c/system/main.h" |
| 9 #include "mojo/shell/public/cpp/application_runner.h" | 9 #include "mojo/shell/public/cpp/application_runner.h" |
| 10 | 10 |
| 11 MojoResult MojoMain(MojoHandle mojo_handle) { | 11 MojoResult MojoMain(MojoHandle mojo_handle) { |
| 12 // Enable logging. | 12 // Enable logging. |
| 13 base::AtExitManager at_exit; | 13 base::AtExitManager at_exit; |
| 14 mojo::ApplicationRunner::InitBaseCommandLine(); | 14 mojo::ApplicationRunner::InitBaseCommandLine(); |
| 15 mojo::InitLogging(); | 15 mojo::InitLogging(); |
| 16 | 16 |
| 17 scoped_ptr<mojo::ApplicationDelegate> app_delegate = | 17 scoped_ptr<mojo::ShellClient> app_delegate = |
| 18 media::MojoMediaApplication::CreateApp(); | 18 media::MojoMediaApplication::CreateApp(); |
| 19 mojo::ApplicationRunner runner(app_delegate.release()); | 19 mojo::ApplicationRunner runner(app_delegate.release()); |
| 20 return runner.Run(mojo_handle, false /* init_base */); | 20 return runner.Run(mojo_handle, false /* init_base */); |
| 21 } | 21 } |
| OLD | NEW |