| 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 <map> | 5 #include <map> |
| 6 | 6 |
| 7 #include "base/bind.h" | 7 #include "base/bind.h" |
| 8 #include "base/macros.h" | 8 #include "base/macros.h" |
| 9 #include "base/stl_util.h" | 9 #include "base/stl_util.h" |
| 10 #include "examples/bitmap_uploader/bitmap_uploader.h" | 10 #include "examples/bitmap_uploader/bitmap_uploader.h" |
| (...skipping 171 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 182 EmbeddeePtr embeddee_; | 182 EmbeddeePtr embeddee_; |
| 183 EmbedderImplProvider embeddee_provider_; | 183 EmbedderImplProvider embeddee_provider_; |
| 184 ViewToUploader uploaders_; | 184 ViewToUploader uploaders_; |
| 185 GURL url_; | 185 GURL url_; |
| 186 | 186 |
| 187 DISALLOW_COPY_AND_ASSIGN(WMFlowApp); | 187 DISALLOW_COPY_AND_ASSIGN(WMFlowApp); |
| 188 }; | 188 }; |
| 189 | 189 |
| 190 } // namespace examples | 190 } // namespace examples |
| 191 | 191 |
| 192 MojoResult MojoMain(MojoHandle shell_handle) { | 192 MojoResult MojoMain(MojoHandle application_request) { |
| 193 mojo::ApplicationRunnerChromium runner(new examples::WMFlowApp); | 193 mojo::ApplicationRunnerChromium runner(new examples::WMFlowApp); |
| 194 return runner.Run(shell_handle); | 194 return runner.Run(application_request); |
| 195 } | 195 } |
| OLD | NEW |