| 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/application/application_runner_chromium.h" | |
| 10 #include "mojo/public/c/system/main.h" | 9 #include "mojo/public/c/system/main.h" |
| 11 #include "mojo/public/cpp/application/application_delegate.h" | 10 #include "mojo/public/cpp/application/application_impl_base.h" |
| 11 #include "mojo/public/cpp/application/run_application.h" |
| 12 #include "mojo/public/cpp/application/service_provider_impl.h" | 12 #include "mojo/public/cpp/application/service_provider_impl.h" |
| 13 #include "mojo/public/cpp/system/macros.h" | 13 #include "mojo/public/cpp/system/macros.h" |
| 14 #include "mojo/services/log/interfaces/log.mojom.h" | 14 #include "mojo/services/log/interfaces/log.mojom.h" |
| 15 #include "services/log/log_impl.h" | 15 #include "services/log/log_impl.h" |
| 16 | 16 |
| 17 namespace mojo { | 17 namespace mojo { |
| 18 namespace log { | 18 namespace log { |
| 19 | 19 |
| 20 // Provides the mojo.log.Log service. Binds a new Log implementation for each | 20 // Provides the mojo.log.Log service. Binds a new Log implementation for each |
| 21 // Log interface request. | 21 // Log interface request. |
| 22 class LogApp : public ApplicationDelegate { | 22 class LogApp : public ApplicationImplBase { |
| 23 public: | 23 public: |
| 24 LogApp() {} | 24 LogApp() {} |
| 25 ~LogApp() override {} | 25 ~LogApp() override {} |
| 26 | 26 |
| 27 private: | 27 private: |
| 28 // |ApplicationDelegate| override: | 28 // |ApplicationImplBase| override: |
| 29 bool ConfigureIncomingConnection( | 29 bool OnAcceptConnection(ServiceProviderImpl* service_provider_impl) override { |
| 30 ServiceProviderImpl* service_provider_impl) override { | |
| 31 service_provider_impl->AddService<Log>( | 30 service_provider_impl->AddService<Log>( |
| 32 [](const ConnectionContext& connection_context, | 31 [](const ConnectionContext& connection_context, |
| 33 InterfaceRequest<Log> log_request) { | 32 InterfaceRequest<Log> log_request) { |
| 34 LogImpl::Create(connection_context, std::move(log_request), | 33 LogImpl::Create(connection_context, std::move(log_request), |
| 35 [](const std::string& message) { | 34 [](const std::string& message) { |
| 36 fprintf(stderr, "%s\n", message.c_str()); | 35 fprintf(stderr, "%s\n", message.c_str()); |
| 37 }); | 36 }); |
| 38 }); | 37 }); |
| 39 return true; | 38 return true; |
| 40 } | 39 } |
| 41 | 40 |
| 42 MOJO_DISALLOW_COPY_AND_ASSIGN(LogApp); | 41 MOJO_DISALLOW_COPY_AND_ASSIGN(LogApp); |
| 43 }; | 42 }; |
| 44 | 43 |
| 45 } // namespace log | 44 } // namespace log |
| 46 } // namespace mojo | 45 } // namespace mojo |
| 47 | 46 |
| 48 MojoResult MojoMain(MojoHandle application_request) { | 47 MojoResult MojoMain(MojoHandle application_request) { |
| 49 mojo::ApplicationRunnerChromium runner(new mojo::log::LogApp()); | 48 mojo::log::LogApp log_app; |
| 50 return runner.Run(application_request); | 49 return mojo::RunMainApplication(application_request, &log_app); |
| 51 } | 50 } |
| OLD | NEW |