| 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 "base/macros.h" |
| 7 #include "examples/bitmap_uploader/bitmap_uploader.h" | 7 #include "examples/bitmap_uploader/bitmap_uploader.h" |
| 8 #include "examples/wm_flow/app/embedder.mojom.h" | 8 #include "examples/wm_flow/app/embedder.mojom.h" |
| 9 #include "examples/wm_flow/embedded/embeddee.mojom.h" | 9 #include "examples/wm_flow/embedded/embeddee.mojom.h" |
| 10 #include "mojo/application/application_runner_chromium.h" | 10 #include "mojo/application/application_runner_chromium.h" |
| (...skipping 90 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 101 scoped_ptr<mojo::ViewManagerClientFactory> view_manager_client_factory_; | 101 scoped_ptr<mojo::ViewManagerClientFactory> view_manager_client_factory_; |
| 102 EmbedderPtr embedder_; | 102 EmbedderPtr embedder_; |
| 103 mojo::ServiceProviderImpl embeddee_provider_impl_; | 103 mojo::ServiceProviderImpl embeddee_provider_impl_; |
| 104 scoped_ptr<mojo::BitmapUploader> bitmap_uploader_; | 104 scoped_ptr<mojo::BitmapUploader> bitmap_uploader_; |
| 105 | 105 |
| 106 DISALLOW_COPY_AND_ASSIGN(WMFlowEmbedded); | 106 DISALLOW_COPY_AND_ASSIGN(WMFlowEmbedded); |
| 107 }; | 107 }; |
| 108 | 108 |
| 109 } // namespace examples | 109 } // namespace examples |
| 110 | 110 |
| 111 MojoResult MojoMain(MojoHandle shell_handle) { | 111 MojoResult MojoMain(MojoHandle application_request) { |
| 112 mojo::ApplicationRunnerChromium runner(new examples::WMFlowEmbedded); | 112 mojo::ApplicationRunnerChromium runner(new examples::WMFlowEmbedded); |
| 113 return runner.Run(shell_handle); | 113 return runner.Run(application_request); |
| 114 } | 114 } |
| 115 | 115 |
| OLD | NEW |