| 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 "examples/surfaces_app/child_impl.h" | 6 #include "examples/surfaces_app/child_impl.h" |
| 7 #include "mojo/application/application_runner_chromium.h" | 7 #include "mojo/application/application_runner_chromium.h" |
| 8 #include "mojo/public/c/system/main.h" | 8 #include "mojo/public/c/system/main.h" |
| 9 #include "mojo/public/cpp/application/application_connection.h" | 9 #include "mojo/public/cpp/application/application_connection.h" |
| 10 #include "mojo/public/cpp/application/application_delegate.h" | 10 #include "mojo/public/cpp/application/application_delegate.h" |
| (...skipping 27 matching lines...) Expand all Loading... |
| 38 | 38 |
| 39 private: | 39 private: |
| 40 ApplicationConnection* surfaces_service_connection_; | 40 ApplicationConnection* surfaces_service_connection_; |
| 41 | 41 |
| 42 DISALLOW_COPY_AND_ASSIGN(ChildApp); | 42 DISALLOW_COPY_AND_ASSIGN(ChildApp); |
| 43 }; | 43 }; |
| 44 | 44 |
| 45 } // namespace examples | 45 } // namespace examples |
| 46 } // namespace mojo | 46 } // namespace mojo |
| 47 | 47 |
| 48 MojoResult MojoMain(MojoHandle shell_handle) { | 48 MojoResult MojoMain(MojoHandle application_request) { |
| 49 mojo::ApplicationRunnerChromium runner(new mojo::examples::ChildApp); | 49 mojo::ApplicationRunnerChromium runner(new mojo::examples::ChildApp); |
| 50 return runner.Run(shell_handle); | 50 return runner.Run(application_request); |
| 51 } | 51 } |
| OLD | NEW |