| OLD | NEW |
| 1 // Copyright 2014 The Chromium Authors. All rights reserved. | 1 // Copyright 2014 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 "examples/echo/echo.mojom.h" | 7 #include "examples/echo/echo.mojom.h" |
| 6 #include "mojo/common/binding_set.h" | 8 #include "mojo/common/binding_set.h" |
| 7 #include "mojo/public/c/system/main.h" | 9 #include "mojo/public/c/system/main.h" |
| 8 #include "mojo/public/cpp/application/application_connection.h" | 10 #include "mojo/public/cpp/application/application_connection.h" |
| 9 #include "mojo/public/cpp/application/application_delegate.h" | 11 #include "mojo/public/cpp/application/application_delegate.h" |
| 10 #include "mojo/public/cpp/application/application_runner.h" | 12 #include "mojo/public/cpp/application/application_runner.h" |
| 11 #include "mojo/public/cpp/application/interface_factory.h" | 13 #include "mojo/public/cpp/application/interface_factory.h" |
| 12 #include "mojo/public/cpp/bindings/strong_binding.h" | 14 #include "mojo/public/cpp/bindings/strong_binding.h" |
| 13 | 15 |
| 14 namespace mojo { | 16 namespace mojo { |
| (...skipping 111 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 126 EchoImpl echo_impl_; | 128 EchoImpl echo_impl_; |
| 127 | 129 |
| 128 mojo::Binding<Echo> binding_; | 130 mojo::Binding<Echo> binding_; |
| 129 }; | 131 }; |
| 130 | 132 |
| 131 } // namespace examples | 133 } // namespace examples |
| 132 } // namespace mojo | 134 } // namespace mojo |
| 133 | 135 |
| 134 MojoResult MojoMain(MojoHandle application_request) { | 136 MojoResult MojoMain(MojoHandle application_request) { |
| 135 // Uncomment one of the three servers at a time to see it work: | 137 // Uncomment one of the three servers at a time to see it work: |
| 136 mojo::ApplicationRunner runner(new mojo::examples::MultiServer()); | 138 mojo::ApplicationRunner runner(std::unique_ptr<mojo::examples::MultiServer>( |
| 139 new mojo::examples::MultiServer())); |
| 137 // mojo::ApplicationRunner runner(new mojo::examples::SingletonServer()); | 140 // mojo::ApplicationRunner runner(new mojo::examples::SingletonServer()); |
| 138 // mojo::ApplicationRunner runner(new mojo::examples::OneAtATimeServer()); | 141 // mojo::ApplicationRunner runner(new mojo::examples::OneAtATimeServer()); |
| 139 | 142 |
| 140 return runner.Run(application_request); | 143 return runner.Run(application_request); |
| 141 } | 144 } |
| OLD | NEW |