| 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 "mojo/application/application_runner_chromium.h" |
| 5 #include "mojo/examples/surfaces_app/child_impl.h" | 6 #include "mojo/examples/surfaces_app/child_impl.h" |
| 6 #include "mojo/public/c/system/main.h" | 7 #include "mojo/public/c/system/main.h" |
| 7 #include "mojo/public/cpp/application/application_connection.h" | 8 #include "mojo/public/cpp/application/application_connection.h" |
| 8 #include "mojo/public/cpp/application/application_delegate.h" | 9 #include "mojo/public/cpp/application/application_delegate.h" |
| 9 #include "mojo/public/cpp/application/application_impl.h" | 10 #include "mojo/public/cpp/application/application_impl.h" |
| 10 #include "mojo/public/cpp/application/application_runner_chromium.h" | |
| 11 #include "mojo/public/cpp/bindings/string.h" | 11 #include "mojo/public/cpp/bindings/string.h" |
| 12 | 12 |
| 13 namespace mojo { | 13 namespace mojo { |
| 14 namespace examples { | 14 namespace examples { |
| 15 | 15 |
| 16 class ChildApp : public ApplicationDelegate, public InterfaceFactory<Child> { | 16 class ChildApp : public ApplicationDelegate, public InterfaceFactory<Child> { |
| 17 public: | 17 public: |
| 18 ChildApp() {} | 18 ChildApp() {} |
| 19 virtual ~ChildApp() {} | 19 virtual ~ChildApp() {} |
| 20 | 20 |
| (...skipping 21 matching lines...) Expand all Loading... |
| 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 shell_handle) { |
| 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(shell_handle); |
| 51 } | 51 } |
| OLD | NEW |