| 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" |
| 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> { |
| 18 public: | 18 public: |
| 19 ChildApp() {} | 19 ChildApp() {} |
| 20 virtual ~ChildApp() {} | 20 ~ChildApp() override {} |
| 21 | 21 |
| 22 virtual void Initialize(ApplicationImpl* app) override { | 22 void Initialize(ApplicationImpl* app) override { |
| 23 surfaces_service_connection_ = | 23 surfaces_service_connection_ = |
| 24 app->ConnectToApplication("mojo:surfaces_service"); | 24 app->ConnectToApplication("mojo:surfaces_service"); |
| 25 } | 25 } |
| 26 | 26 |
| 27 // ApplicationDelegate implementation. | 27 // ApplicationDelegate implementation. |
| 28 virtual bool ConfigureIncomingConnection( | 28 bool ConfigureIncomingConnection(ApplicationConnection* connection) override { |
| 29 ApplicationConnection* connection) override { | |
| 30 connection->AddService(this); | 29 connection->AddService(this); |
| 31 return true; | 30 return true; |
| 32 } | 31 } |
| 33 | 32 |
| 34 // InterfaceFactory<Child> implementation. | 33 // InterfaceFactory<Child> implementation. |
| 35 virtual void Create(ApplicationConnection* connection, | 34 void Create(ApplicationConnection* connection, |
| 36 InterfaceRequest<Child> request) override { | 35 InterfaceRequest<Child> request) override { |
| 37 new ChildImpl(surfaces_service_connection_, request.Pass()); | 36 new ChildImpl(surfaces_service_connection_, request.Pass()); |
| 38 } | 37 } |
| 39 | 38 |
| 40 private: | 39 private: |
| 41 ApplicationConnection* surfaces_service_connection_; | 40 ApplicationConnection* surfaces_service_connection_; |
| 42 | 41 |
| 43 DISALLOW_COPY_AND_ASSIGN(ChildApp); | 42 DISALLOW_COPY_AND_ASSIGN(ChildApp); |
| 44 }; | 43 }; |
| 45 | 44 |
| 46 } // namespace examples | 45 } // namespace examples |
| 47 } // namespace mojo | 46 } // namespace mojo |
| 48 | 47 |
| 49 MojoResult MojoMain(MojoHandle shell_handle) { | 48 MojoResult MojoMain(MojoHandle shell_handle) { |
| 50 mojo::ApplicationRunnerChromium runner(new mojo::examples::ChildApp); | 49 mojo::ApplicationRunnerChromium runner(new mojo::examples::ChildApp); |
| 51 return runner.Run(shell_handle); | 50 return runner.Run(shell_handle); |
| 52 } | 51 } |
| OLD | NEW |