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 "base/bind.h" | 6 #include "base/bind.h" |
| 7 #include "base/logging.h" |
7 #include "base/memory/ptr_util.h" | 8 #include "base/memory/ptr_util.h" |
8 #include "media/mojo/services/mojo_media_application.h" | 9 #include "media/mojo/services/mojo_media_application.h" |
9 #include "media/mojo/services/test_mojo_media_client.h" | 10 #include "media/mojo/services/test_mojo_media_client.h" |
10 #include "mojo/logging/init_logging.h" | |
11 #include "mojo/public/c/system/main.h" | 11 #include "mojo/public/c/system/main.h" |
12 #include "services/shell/public/cpp/application_runner.h" | 12 #include "services/shell/public/cpp/application_runner.h" |
13 | 13 |
14 namespace { | 14 namespace { |
15 | 15 |
16 shell::ApplicationRunner* g_runner = nullptr; | 16 shell::ApplicationRunner* g_runner = nullptr; |
17 | 17 |
18 void QuitApplication() { | 18 void QuitApplication() { |
19 DCHECK(g_runner); | 19 DCHECK(g_runner); |
20 g_runner->Quit(); | 20 g_runner->Quit(); |
21 } | 21 } |
22 | 22 |
23 } // namespace | 23 } // namespace |
24 | 24 |
25 MojoResult MojoMain(MojoHandle mojo_handle) { | 25 MojoResult MojoMain(MojoHandle mojo_handle) { |
26 // Enable logging. | 26 // Enable logging. |
27 base::AtExitManager at_exit; | 27 base::AtExitManager at_exit; |
28 shell::ApplicationRunner::InitBaseCommandLine(); | 28 shell::ApplicationRunner::InitBaseCommandLine(); |
29 mojo::InitLogging(); | 29 |
| 30 logging::LoggingSettings settings; |
| 31 settings.logging_dest = logging::LOG_TO_SYSTEM_DEBUG_LOG; |
| 32 logging::InitLogging(settings); |
30 | 33 |
31 shell::ApplicationRunner runner(new media::MojoMediaApplication( | 34 shell::ApplicationRunner runner(new media::MojoMediaApplication( |
32 base::WrapUnique(new media::TestMojoMediaClient()), | 35 base::WrapUnique(new media::TestMojoMediaClient()), |
33 base::Bind(&QuitApplication))); | 36 base::Bind(&QuitApplication))); |
34 g_runner = &runner; | 37 g_runner = &runner; |
35 return runner.Run(mojo_handle, false /* init_base */); | 38 return runner.Run(mojo_handle, false /* init_base */); |
36 } | 39 } |
OLD | NEW |