| 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 "base/bind.h" | 5 #include "base/bind.h" |
| 6 #include "mojo/environment/scoped_chromium_init.h" |
| 6 #include "mojo/public/c/system/main.h" | 7 #include "mojo/public/c/system/main.h" |
| 7 #include "mojo/public/cpp/application/application_impl_base.h" | 8 #include "mojo/public/cpp/application/application_impl_base.h" |
| 8 #include "mojo/public/cpp/application/connect.h" | 9 #include "mojo/public/cpp/application/connect.h" |
| 9 #include "mojo/public/cpp/application/run_application.h" | 10 #include "mojo/public/cpp/application/run_application.h" |
| 10 #include "mojo/public/cpp/bindings/interface_ptr.h" | 11 #include "mojo/public/cpp/bindings/interface_ptr.h" |
| 11 #include "mojo/public/cpp/system/message_pipe.h" | 12 #include "mojo/public/cpp/system/message_pipe.h" |
| 12 #include "mojo/services/http_server/cpp/http_server_util.h" | 13 #include "mojo/services/http_server/cpp/http_server_util.h" |
| 13 #include "mojo/services/http_server/interfaces/http_server.mojom.h" | 14 #include "mojo/services/http_server/interfaces/http_server.mojom.h" |
| 14 #include "mojo/services/http_server/interfaces/http_server_factory.mojom.h" | 15 #include "mojo/services/http_server/interfaces/http_server_factory.mojom.h" |
| 15 #include "mojo/services/network/interfaces/net_address.mojom.h" | 16 #include "mojo/services/network/interfaces/net_address.mojom.h" |
| (...skipping 52 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 68 Binding<http_server::HttpHandler> binding_; | 69 Binding<http_server::HttpHandler> binding_; |
| 69 http_server::HttpServerPtr http_server_; | 70 http_server::HttpServerPtr http_server_; |
| 70 | 71 |
| 71 DISALLOW_COPY_AND_ASSIGN(HttpHandler); | 72 DISALLOW_COPY_AND_ASSIGN(HttpHandler); |
| 72 }; | 73 }; |
| 73 | 74 |
| 74 } // namespace examples | 75 } // namespace examples |
| 75 } // namespace mojo | 76 } // namespace mojo |
| 76 | 77 |
| 77 MojoResult MojoMain(MojoHandle application_request) { | 78 MojoResult MojoMain(MojoHandle application_request) { |
| 79 mojo::ScopedChromiumInit init; |
| 78 mojo::examples::HttpHandler http_handler; | 80 mojo::examples::HttpHandler http_handler; |
| 79 return mojo::RunMainApplication(application_request, &http_handler); | 81 return mojo::RunApplication(application_request, &http_handler); |
| 80 } | 82 } |
| OLD | NEW |