| 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 "mojo/public/c/system/main.h" | 5 #include "mojo/public/c/system/main.h" |
| 6 #include "mojo/public/cpp/application/application_impl_base.h" | 6 #include "mojo/public/cpp/application/application_impl_base.h" |
| 7 #include "mojo/public/cpp/application/run_application.h" | 7 #include "mojo/public/cpp/application/run_application.h" |
| 8 #include "mojo/public/cpp/application/service_provider_impl.h" | 8 #include "mojo/public/cpp/application/service_provider_impl.h" |
| 9 #include "mojo/public/cpp/bindings/callback.h" | 9 #include "mojo/public/cpp/bindings/callback.h" |
| 10 #include "mojo/public/cpp/bindings/interface_request.h" | 10 #include "mojo/public/cpp/bindings/interface_request.h" |
| (...skipping 39 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 50 mojo::InterfaceRequest<Pingable> pingable_request) { | 50 mojo::InterfaceRequest<Pingable> pingable_request) { |
| 51 new PingableImpl(pingable_request.Pass(), url(), | 51 new PingableImpl(pingable_request.Pass(), url(), |
| 52 connection_context.connection_url); | 52 connection_context.connection_url); |
| 53 }); | 53 }); |
| 54 return true; | 54 return true; |
| 55 } | 55 } |
| 56 }; | 56 }; |
| 57 | 57 |
| 58 MojoResult MojoMain(MojoHandle application_request) { | 58 MojoResult MojoMain(MojoHandle application_request) { |
| 59 PingableApp pingable_app; | 59 PingableApp pingable_app; |
| 60 return mojo::RunMainApplication(application_request, &pingable_app); | 60 return mojo::RunApplication(application_request, &pingable_app); |
| 61 } | 61 } |
| OLD | NEW |