| 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 <memory> |
| 6 |
| 5 #include "mojo/public/c/system/main.h" | 7 #include "mojo/public/c/system/main.h" |
| 6 #include "mojo/public/cpp/application/application_delegate.h" | 8 #include "mojo/public/cpp/application/application_delegate.h" |
| 7 #include "mojo/public/cpp/application/application_impl.h" | 9 #include "mojo/public/cpp/application/application_impl.h" |
| 8 #include "mojo/public/cpp/application/application_runner.h" | 10 #include "mojo/public/cpp/application/application_runner.h" |
| 9 #include "mojo/public/cpp/application/interface_factory.h" | 11 #include "mojo/public/cpp/application/interface_factory.h" |
| 10 #include "mojo/public/cpp/bindings/callback.h" | 12 #include "mojo/public/cpp/bindings/callback.h" |
| 11 #include "mojo/public/cpp/bindings/interface_request.h" | 13 #include "mojo/public/cpp/bindings/interface_request.h" |
| 12 #include "mojo/public/cpp/bindings/strong_binding.h" | 14 #include "mojo/public/cpp/bindings/strong_binding.h" |
| 13 #include "shell/test/pingable.mojom.h" | 15 #include "shell/test/pingable.mojom.h" |
| 14 | 16 |
| (...skipping 43 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 58 // InterfaceFactory<Pingable>: | 60 // InterfaceFactory<Pingable>: |
| 59 void Create(mojo::ApplicationConnection* connection, | 61 void Create(mojo::ApplicationConnection* connection, |
| 60 mojo::InterfaceRequest<Pingable> request) override { | 62 mojo::InterfaceRequest<Pingable> request) override { |
| 61 new PingableImpl(request.Pass(), app_url_, connection->GetConnectionURL()); | 63 new PingableImpl(request.Pass(), app_url_, connection->GetConnectionURL()); |
| 62 } | 64 } |
| 63 | 65 |
| 64 std::string app_url_; | 66 std::string app_url_; |
| 65 }; | 67 }; |
| 66 | 68 |
| 67 MojoResult MojoMain(MojoHandle application_request) { | 69 MojoResult MojoMain(MojoHandle application_request) { |
| 68 mojo::ApplicationRunner runner(new PingableApp); | 70 mojo::ApplicationRunner runner( |
| 71 std::unique_ptr<PingableApp>(new PingableApp())); |
| 69 return runner.Run(application_request); | 72 return runner.Run(application_request); |
| 70 } | 73 } |
| OLD | NEW |