| 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 "mojo/application/application_runner_chromium.h" | 7 #include "mojo/application/application_runner_chromium.h" |
| 7 #include "mojo/examples/surfaces_app/child_impl.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" |
| 11 #include "mojo/public/cpp/application/application_impl.h" | 11 #include "mojo/public/cpp/application/application_impl.h" |
| 12 #include "mojo/public/cpp/bindings/string.h" | 12 #include "mojo/public/cpp/bindings/string.h" |
| 13 | 13 |
| 14 namespace mojo { | 14 namespace mojo { |
| 15 namespace examples { | 15 namespace examples { |
| 16 | 16 |
| 17 class ChildApp : public ApplicationDelegate, public InterfaceFactory<Child> { | 17 class ChildApp : public ApplicationDelegate, public InterfaceFactory<Child> { |
| (...skipping 25 matching lines...) Expand all Loading... |
| 43 DISALLOW_COPY_AND_ASSIGN(ChildApp); | 43 DISALLOW_COPY_AND_ASSIGN(ChildApp); |
| 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 shell_handle) { |
| 50 mojo::ApplicationRunnerChromium runner(new mojo::examples::ChildApp); | 50 mojo::ApplicationRunnerChromium runner(new mojo::examples::ChildApp); |
| 51 return runner.Run(shell_handle); | 51 return runner.Run(shell_handle); |
| 52 } | 52 } |
| OLD | NEW |