| 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 "base/memory/scoped_ptr.h" | 5 #include "base/memory/scoped_ptr.h" |
| 6 #include "mojo/public/c/system/main.h" | 6 #include "mojo/public/c/system/main.h" |
| 7 #include "mojo/public/cpp/application/application_delegate.h" | 7 #include "mojo/public/cpp/application/application_delegate.h" |
| 8 #include "mojo/public/cpp/application/application_impl.h" | 8 #include "mojo/public/cpp/application/application_impl.h" |
| 9 #include "mojo/public/cpp/application/application_runner.h" | 9 #include "mojo/public/cpp/application/application_runner.h" |
| 10 #include "mojo/public/cpp/application/interface_factory.h" | 10 #include "mojo/public/cpp/application/interface_factory.h" |
| (...skipping 28 matching lines...) Expand all Loading... |
| 39 | 39 |
| 40 http_server_factory_->AddBinding(request.Pass()); | 40 http_server_factory_->AddBinding(request.Pass()); |
| 41 } | 41 } |
| 42 | 42 |
| 43 mojo::ApplicationImpl* app_; | 43 mojo::ApplicationImpl* app_; |
| 44 scoped_ptr<HttpServerFactoryImpl> http_server_factory_; | 44 scoped_ptr<HttpServerFactoryImpl> http_server_factory_; |
| 45 }; | 45 }; |
| 46 | 46 |
| 47 } // namespace http_server | 47 } // namespace http_server |
| 48 | 48 |
| 49 MojoResult MojoMain(MojoHandle shell_handle) { | 49 MojoResult MojoMain(MojoHandle application_request) { |
| 50 mojo::ApplicationRunner runner(new http_server::HttpServerApp); | 50 mojo::ApplicationRunner runner(new http_server::HttpServerApp); |
| 51 return runner.Run(shell_handle); | 51 return runner.Run(application_request); |
| 52 } | 52 } |
| OLD | NEW |