| OLD | NEW |
| 1 // Copyright 2016 The Chromium Authors. All rights reserved. | 1 // Copyright 2016 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 <string> | 5 #include <string> |
| 6 #include <utility> | 6 #include <utility> |
| 7 | 7 |
| 8 #include "examples/hello_mojo/hello_mojo.mojom.h" | 8 #include "examples/hello_mojo/hello_mojo.mojom.h" |
| 9 #include "mojo/public/c/system/main.h" | 9 #include "mojo/public/c/system/main.h" |
| 10 #include "mojo/public/cpp/application/application_impl_base.h" | 10 #include "mojo/public/cpp/application/application_impl_base.h" |
| (...skipping 42 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 53 } | 53 } |
| 54 | 54 |
| 55 private: | 55 private: |
| 56 MOJO_DISALLOW_COPY_AND_ASSIGN(HelloMojoServerApp); | 56 MOJO_DISALLOW_COPY_AND_ASSIGN(HelloMojoServerApp); |
| 57 }; | 57 }; |
| 58 | 58 |
| 59 } // namespace | 59 } // namespace |
| 60 | 60 |
| 61 MojoResult MojoMain(MojoHandle application_request) { | 61 MojoResult MojoMain(MojoHandle application_request) { |
| 62 HelloMojoServerApp hello_mojo_server_app; | 62 HelloMojoServerApp hello_mojo_server_app; |
| 63 return mojo::RunMainApplication(application_request, &hello_mojo_server_app); | 63 return mojo::RunApplication(application_request, &hello_mojo_server_app); |
| 64 } | 64 } |
| OLD | NEW |