| 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/examples/surfaces_app/child_impl.h" | 5 #include "mojo/examples/surfaces_app/child_impl.h" |
| 6 #include "mojo/public/c/system/main.h" |
| 6 #include "mojo/public/cpp/application/application_connection.h" | 7 #include "mojo/public/cpp/application/application_connection.h" |
| 7 #include "mojo/public/cpp/application/application_delegate.h" | 8 #include "mojo/public/cpp/application/application_delegate.h" |
| 8 #include "mojo/public/cpp/application/application_impl.h" | 9 #include "mojo/public/cpp/application/application_impl.h" |
| 10 #include "mojo/public/cpp/application/application_runner_chromium.h" |
| 9 #include "mojo/public/cpp/bindings/string.h" | 11 #include "mojo/public/cpp/bindings/string.h" |
| 10 | 12 |
| 11 namespace mojo { | 13 namespace mojo { |
| 12 namespace examples { | 14 namespace examples { |
| 13 | 15 |
| 14 class ChildApp : public ApplicationDelegate, public InterfaceFactory<Child> { | 16 class ChildApp : public ApplicationDelegate, public InterfaceFactory<Child> { |
| 15 public: | 17 public: |
| 16 ChildApp() {} | 18 ChildApp() {} |
| 17 virtual ~ChildApp() {} | 19 virtual ~ChildApp() {} |
| 18 | 20 |
| (...skipping 15 matching lines...) Expand all Loading... |
| 34 BindToRequest(new ChildImpl(surfaces_service_connection_), &request); | 36 BindToRequest(new ChildImpl(surfaces_service_connection_), &request); |
| 35 } | 37 } |
| 36 | 38 |
| 37 private: | 39 private: |
| 38 ApplicationConnection* surfaces_service_connection_; | 40 ApplicationConnection* surfaces_service_connection_; |
| 39 | 41 |
| 40 DISALLOW_COPY_AND_ASSIGN(ChildApp); | 42 DISALLOW_COPY_AND_ASSIGN(ChildApp); |
| 41 }; | 43 }; |
| 42 | 44 |
| 43 } // namespace examples | 45 } // namespace examples |
| 46 } // namespace mojo |
| 44 | 47 |
| 45 // static | 48 MojoResult MojoMain(MojoHandle shell_handle) { |
| 46 ApplicationDelegate* ApplicationDelegate::Create() { | 49 mojo::ApplicationRunnerChromium runner(new mojo::examples::ChildApp); |
| 47 return new examples::ChildApp(); | 50 return runner.Run(shell_handle); |
| 48 } | 51 } |
| 49 | |
| 50 } // namespace mojo | |
| OLD | NEW |