| 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/logging.h" | 5 #include "base/logging.h" |
| 6 #include "mojo/environment/scoped_chromium_init.h" |
| 6 #include "mojo/public/c/system/main.h" | 7 #include "mojo/public/c/system/main.h" |
| 7 #include "mojo/public/cpp/application/run_application.h" | 8 #include "mojo/public/cpp/application/run_application.h" |
| 8 #include "mojo/public/cpp/application/service_provider_impl.h" | 9 #include "mojo/public/cpp/application/service_provider_impl.h" |
| 9 #include "services/media/audio/audio_server_app.h" | 10 #include "services/media/audio/audio_server_app.h" |
| 10 | 11 |
| 11 namespace mojo { | 12 namespace mojo { |
| 12 namespace media { | 13 namespace media { |
| 13 namespace audio { | 14 namespace audio { |
| 14 | 15 |
| 15 AudioServerApp::AudioServerApp() {} | 16 AudioServerApp::AudioServerApp() {} |
| (...skipping 10 matching lines...) Expand all Loading... |
| 26 bindings_.AddBinding(&server_impl_, audio_server_request.Pass()); | 27 bindings_.AddBinding(&server_impl_, audio_server_request.Pass()); |
| 27 }); | 28 }); |
| 28 return true; | 29 return true; |
| 29 } | 30 } |
| 30 | 31 |
| 31 } // namespace audio | 32 } // namespace audio |
| 32 } // namespace media | 33 } // namespace media |
| 33 } // namespace mojo | 34 } // namespace mojo |
| 34 | 35 |
| 35 MojoResult MojoMain(MojoHandle app_request) { | 36 MojoResult MojoMain(MojoHandle app_request) { |
| 37 mojo::ScopedChromiumInit init; |
| 36 mojo::media::audio::AudioServerApp audio_server_app; | 38 mojo::media::audio::AudioServerApp audio_server_app; |
| 37 return mojo::RunMainApplication(app_request, &audio_server_app); | 39 return mojo::RunApplication(app_request, &audio_server_app); |
| 38 } | 40 } |
| OLD | NEW |