| 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_delegate.h" | 6 #include "mojo/public/cpp/application/application_delegate.h" |
| 7 #include "mojo/public/cpp/application/application_impl.h" | 7 #include "mojo/public/cpp/application/application_impl.h" |
| 8 #include "mojo/public/cpp/application/application_runner.h" | 8 #include "mojo/public/cpp/application/application_runner.h" |
| 9 #include "mojo/public/cpp/application/interface_factory.h" | 9 #include "mojo/public/cpp/application/interface_factory.h" |
| 10 #include "mojo/public/cpp/bindings/callback.h" | 10 #include "mojo/public/cpp/bindings/callback.h" |
| (...skipping 45 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 56 void Create(mojo::ApplicationConnection* connection, | 56 void Create(mojo::ApplicationConnection* connection, |
| 57 mojo::InterfaceRequest<Pingable> request) override { | 57 mojo::InterfaceRequest<Pingable> request) override { |
| 58 new PingableImpl(request.Pass(), app_url_, connection->GetConnectionURL()); | 58 new PingableImpl(request.Pass(), app_url_, connection->GetConnectionURL()); |
| 59 } | 59 } |
| 60 | 60 |
| 61 std::string app_url_; | 61 std::string app_url_; |
| 62 }; | 62 }; |
| 63 | 63 |
| 64 } // namespace mojo | 64 } // namespace mojo |
| 65 | 65 |
| 66 MojoResult MojoMain(MojoHandle shell_handle) { | 66 MojoResult MojoMain(MojoHandle application_request) { |
| 67 mojo::ApplicationRunner runner(new mojo::PingableApp); | 67 mojo::ApplicationRunner runner(new mojo::PingableApp); |
| 68 return runner.Run(shell_handle); | 68 return runner.Run(application_request); |
| 69 } | 69 } |
| OLD | NEW |