| 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 <stdio.h> | 5 #include <stdio.h> |
| 6 | 6 |
| 7 #include <utility> | 7 #include <utility> |
| 8 | 8 |
| 9 #include "mojo/environment/scoped_chromium_init.h" |
| 9 #include "mojo/public/c/system/main.h" | 10 #include "mojo/public/c/system/main.h" |
| 10 #include "mojo/public/cpp/application/application_impl_base.h" | 11 #include "mojo/public/cpp/application/application_impl_base.h" |
| 11 #include "mojo/public/cpp/application/run_application.h" | 12 #include "mojo/public/cpp/application/run_application.h" |
| 12 #include "mojo/public/cpp/application/service_provider_impl.h" | 13 #include "mojo/public/cpp/application/service_provider_impl.h" |
| 13 #include "mojo/public/cpp/system/macros.h" | 14 #include "mojo/public/cpp/system/macros.h" |
| 14 #include "mojo/services/log/interfaces/log.mojom.h" | 15 #include "mojo/services/log/interfaces/log.mojom.h" |
| 15 #include "services/log/log_impl.h" | 16 #include "services/log/log_impl.h" |
| 16 | 17 |
| 17 namespace mojo { | 18 namespace mojo { |
| 18 namespace log { | 19 namespace log { |
| (...skipping 19 matching lines...) Expand all Loading... |
| 38 return true; | 39 return true; |
| 39 } | 40 } |
| 40 | 41 |
| 41 MOJO_DISALLOW_COPY_AND_ASSIGN(LogApp); | 42 MOJO_DISALLOW_COPY_AND_ASSIGN(LogApp); |
| 42 }; | 43 }; |
| 43 | 44 |
| 44 } // namespace log | 45 } // namespace log |
| 45 } // namespace mojo | 46 } // namespace mojo |
| 46 | 47 |
| 47 MojoResult MojoMain(MojoHandle application_request) { | 48 MojoResult MojoMain(MojoHandle application_request) { |
| 49 mojo::ScopedChromiumInit init; |
| 48 mojo::log::LogApp log_app; | 50 mojo::log::LogApp log_app; |
| 49 return mojo::RunMainApplication(application_request, &log_app); | 51 return mojo::RunApplication(application_request, &log_app); |
| 50 } | 52 } |
| OLD | NEW |