| 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/application/public/cpp/application_delegate.h" | 5 #include "mojo/application/public/cpp/application_delegate.h" |
| 6 #include "mojo/application/public/cpp/application_impl.h" | 6 #include "mojo/application/public/cpp/application_impl.h" |
| 7 #include "mojo/application/public/cpp/application_runner.h" | 7 #include "mojo/application/public/cpp/application_runner.h" |
| 8 #include "mojo/application/public/cpp/interface_factory.h" | 8 #include "mojo/application/public/cpp/interface_factory.h" |
| 9 #include "mojo/public/c/system/main.h" |
| 10 #include "mojo/public/cpp/bindings/callback.h" |
| 11 #include "mojo/public/cpp/bindings/interface_request.h" |
| 12 #include "mojo/public/cpp/bindings/strong_binding.h" |
| 9 #include "mojo/runner/test/pingable.mojom.h" | 13 #include "mojo/runner/test/pingable.mojom.h" |
| 10 #include "third_party/mojo/src/mojo/public/c/system/main.h" | |
| 11 #include "third_party/mojo/src/mojo/public/cpp/bindings/callback.h" | |
| 12 #include "third_party/mojo/src/mojo/public/cpp/bindings/interface_request.h" | |
| 13 #include "third_party/mojo/src/mojo/public/cpp/bindings/strong_binding.h" | |
| 14 | 14 |
| 15 namespace mojo { | 15 namespace mojo { |
| 16 | 16 |
| 17 class PingableImpl : public Pingable { | 17 class PingableImpl : public Pingable { |
| 18 public: | 18 public: |
| 19 PingableImpl(InterfaceRequest<Pingable> request, | 19 PingableImpl(InterfaceRequest<Pingable> request, |
| 20 const std::string& app_url, | 20 const std::string& app_url, |
| 21 const std::string& connection_url) | 21 const std::string& connection_url) |
| 22 : binding_(this, request.Pass()), | 22 : binding_(this, request.Pass()), |
| 23 app_url_(app_url), | 23 app_url_(app_url), |
| (...skipping 36 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 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 shell_handle) { |
| 67 mojo::ApplicationRunner runner(new mojo::PingableApp); | 67 mojo::ApplicationRunner runner(new mojo::PingableApp); |
| 68 return runner.Run(shell_handle); | 68 return runner.Run(shell_handle); |
| 69 } | 69 } |
| OLD | NEW |