| 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 "mojo/examples/wm_flow/app/embedder.mojom.h" | 6 #include "mojo/examples/wm_flow/app/embedder.mojom.h" |
| 7 #include "mojo/examples/wm_flow/embedded/embeddee.mojom.h" | 7 #include "mojo/examples/wm_flow/embedded/embeddee.mojom.h" |
| 8 #include "mojo/public/cpp/application/application_connection.h" | 8 #include "mojo/public/cpp/application/application_connection.h" |
| 9 #include "mojo/public/cpp/application/application_delegate.h" | 9 #include "mojo/public/cpp/application/application_delegate.h" |
| 10 #include "mojo/public/cpp/application/application_impl.h" | 10 #include "mojo/public/cpp/application/application_impl.h" |
| 11 #include "mojo/public/cpp/application/application_runner_chromium.h" |
| 11 #include "mojo/public/cpp/application/connect.h" | 12 #include "mojo/public/cpp/application/connect.h" |
| 12 #include "mojo/public/cpp/application/interface_factory_impl.h" | 13 #include "mojo/public/cpp/application/interface_factory_impl.h" |
| 13 #include "mojo/public/cpp/application/service_provider_impl.h" | 14 #include "mojo/public/cpp/application/service_provider_impl.h" |
| 14 #include "mojo/services/public/cpp/view_manager/view.h" | 15 #include "mojo/services/public/cpp/view_manager/view.h" |
| 15 #include "mojo/services/public/cpp/view_manager/view_manager.h" | 16 #include "mojo/services/public/cpp/view_manager/view_manager.h" |
| 16 #include "mojo/services/public/cpp/view_manager/view_manager_client_factory.h" | 17 #include "mojo/services/public/cpp/view_manager/view_manager_client_factory.h" |
| 17 #include "mojo/services/public/cpp/view_manager/view_manager_delegate.h" | 18 #include "mojo/services/public/cpp/view_manager/view_manager_delegate.h" |
| 18 #include "mojo/services/public/interfaces/view_manager/view_manager.mojom.h" | 19 #include "mojo/services/public/interfaces/view_manager/view_manager.mojom.h" |
| 19 | 20 |
| 20 namespace examples { | 21 namespace examples { |
| (...skipping 56 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 77 | 78 |
| 78 scoped_ptr<mojo::ViewManagerClientFactory> view_manager_client_factory_; | 79 scoped_ptr<mojo::ViewManagerClientFactory> view_manager_client_factory_; |
| 79 EmbedderPtr embedder_; | 80 EmbedderPtr embedder_; |
| 80 mojo::InterfaceFactoryImpl<EmbeddeeImpl> embeddee_factory_; | 81 mojo::InterfaceFactoryImpl<EmbeddeeImpl> embeddee_factory_; |
| 81 | 82 |
| 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 namespace mojo { | 88 MojoResult MojoMain(MojoHandle shell_handle) { |
| 88 | 89 mojo::ApplicationRunnerChromium runner(new examples::WMFlowEmbedded); |
| 89 // static | 90 return runner.Run(shell_handle); |
| 90 ApplicationDelegate* ApplicationDelegate::Create() { | |
| 91 return new examples::WMFlowEmbedded; | |
| 92 } | 91 } |
| 93 | 92 |
| 94 } // namespace | |
| OLD | NEW |