| 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/macros.h" | 5 #include "base/macros.h" |
| 6 #include "base/memory/scoped_ptr.h" | 6 #include "base/memory/scoped_ptr.h" |
| 7 #include "mojo/application/application_runner_chromium.h" | 7 #include "mojo/application/application_runner_chromium.h" |
| 8 #include "mojo/application/content_handler_factory.h" | 8 #include "mojo/application/content_handler_factory.h" |
| 9 #include "mojo/public/c/system/main.h" | 9 #include "mojo/public/c/system/main.h" |
| 10 #include "mojo/public/cpp/application/application_connection.h" | 10 #include "mojo/public/cpp/application/application_connection.h" |
| (...skipping 28 matching lines...) Expand all Loading... |
| 39 } | 39 } |
| 40 | 40 |
| 41 ContentHandlerFactory content_handler_factory_; | 41 ContentHandlerFactory content_handler_factory_; |
| 42 | 42 |
| 43 DISALLOW_COPY_AND_ASSIGN(RecursiveContentHandler); | 43 DISALLOW_COPY_AND_ASSIGN(RecursiveContentHandler); |
| 44 }; | 44 }; |
| 45 | 45 |
| 46 } // namespace examples | 46 } // namespace examples |
| 47 } // namespace mojo | 47 } // namespace mojo |
| 48 | 48 |
| 49 MojoResult MojoMain(MojoHandle shell_handle) { | 49 MojoResult MojoMain(MojoHandle application_request) { |
| 50 mojo::ApplicationRunnerChromium runner( | 50 mojo::ApplicationRunnerChromium runner( |
| 51 new mojo::examples::RecursiveContentHandler()); | 51 new mojo::examples::RecursiveContentHandler()); |
| 52 return runner.Run(shell_handle); | 52 return runner.Run(application_request); |
| 53 } | 53 } |
| OLD | NEW |