| 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/bind.h" | 5 #include "base/bind.h" |
| 6 #include "base/macros.h" |
| 6 #include "mojo/application/application_runner_chromium.h" | 7 #include "mojo/application/application_runner_chromium.h" |
| 7 #include "mojo/examples/wm_flow/app/embedder.mojom.h" | 8 #include "mojo/examples/wm_flow/app/embedder.mojom.h" |
| 8 #include "mojo/examples/wm_flow/embedded/embeddee.mojom.h" | 9 #include "mojo/examples/wm_flow/embedded/embeddee.mojom.h" |
| 9 #include "mojo/public/cpp/application/application_connection.h" | 10 #include "mojo/public/cpp/application/application_connection.h" |
| 10 #include "mojo/public/cpp/application/application_delegate.h" | 11 #include "mojo/public/cpp/application/application_delegate.h" |
| 11 #include "mojo/public/cpp/application/application_impl.h" | 12 #include "mojo/public/cpp/application/application_impl.h" |
| 12 #include "mojo/public/cpp/application/connect.h" | 13 #include "mojo/public/cpp/application/connect.h" |
| 13 #include "mojo/public/cpp/application/interface_factory_impl.h" | 14 #include "mojo/public/cpp/application/interface_factory_impl.h" |
| 14 #include "mojo/public/cpp/application/service_provider_impl.h" | 15 #include "mojo/public/cpp/application/service_provider_impl.h" |
| 15 #include "mojo/services/public/cpp/view_manager/view.h" | 16 #include "mojo/services/public/cpp/view_manager/view.h" |
| 16 #include "mojo/services/public/cpp/view_manager/view_manager.h" | 17 #include "mojo/services/public/cpp/view_manager/view_manager.h" |
| 17 #include "mojo/services/public/cpp/view_manager/view_manager_client_factory.h" | 18 #include "mojo/services/public/cpp/view_manager/view_manager_client_factory.h" |
| 18 #include "mojo/services/public/cpp/view_manager/view_manager_delegate.h" | 19 #include "mojo/services/public/cpp/view_manager/view_manager_delegate.h" |
| 19 | 20 |
| 20 namespace examples { | 21 namespace examples { |
| 21 | 22 |
| 22 namespace { | 23 namespace { |
| 23 | 24 |
| 24 class EmbeddeeImpl : public mojo::InterfaceImpl<Embeddee> { | 25 class EmbeddeeImpl : public mojo::InterfaceImpl<Embeddee> { |
| 25 public: | 26 public: |
| 26 EmbeddeeImpl() {} | 27 EmbeddeeImpl() {} |
| 27 virtual ~EmbeddeeImpl() {} | 28 virtual ~EmbeddeeImpl() {} |
| 28 | 29 |
| 29 private: | 30 private: |
| 30 // Overridden from Embeddee: | 31 // Overridden from Embeddee: |
| 31 virtual void HelloBack(const mojo::Callback<void()>& callback) OVERRIDE { | 32 virtual void HelloBack(const mojo::Callback<void()>& callback) override { |
| 32 callback.Run(); | 33 callback.Run(); |
| 33 } | 34 } |
| 34 | 35 |
| 35 DISALLOW_COPY_AND_ASSIGN(EmbeddeeImpl); | 36 DISALLOW_COPY_AND_ASSIGN(EmbeddeeImpl); |
| 36 }; | 37 }; |
| 37 | 38 |
| 38 } // namespace | 39 } // namespace |
| 39 | 40 |
| 40 class WMFlowEmbedded : public mojo::ApplicationDelegate, | 41 class WMFlowEmbedded : public mojo::ApplicationDelegate, |
| 41 public mojo::ViewManagerDelegate { | 42 public mojo::ViewManagerDelegate { |
| (...skipping 40 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 82 DISALLOW_COPY_AND_ASSIGN(WMFlowEmbedded); | 83 DISALLOW_COPY_AND_ASSIGN(WMFlowEmbedded); |
| 83 }; | 84 }; |
| 84 | 85 |
| 85 } // namespace examples | 86 } // namespace examples |
| 86 | 87 |
| 87 MojoResult MojoMain(MojoHandle shell_handle) { | 88 MojoResult MojoMain(MojoHandle shell_handle) { |
| 88 mojo::ApplicationRunnerChromium runner(new examples::WMFlowEmbedded); | 89 mojo::ApplicationRunnerChromium runner(new examples::WMFlowEmbedded); |
| 89 return runner.Run(shell_handle); | 90 return runner.Run(shell_handle); |
| 90 } | 91 } |
| 91 | 92 |
| OLD | NEW |