| 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 "base/strings/string_util.h" | 6 #include "base/strings/string_util.h" |
| 7 #include "base/strings/utf_string_conversions.h" | 7 #include "base/strings/utf_string_conversions.h" |
| 8 #include "examples/browser/browser_host.mojom.h" | 8 #include "examples/browser/browser_host.mojom.h" |
| 9 #include "examples/window_manager/window_manager.mojom.h" | 9 #include "examples/window_manager/window_manager.mojom.h" |
| 10 #include "mojo/application/application_runner_chromium.h" | 10 #include "mojo/application/application_runner_chromium.h" |
| (...skipping 115 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 126 GURL url_; | 126 GURL url_; |
| 127 | 127 |
| 128 mojo::Binding<examples::BrowserHost> binding_; | 128 mojo::Binding<examples::BrowserHost> binding_; |
| 129 | 129 |
| 130 DISALLOW_COPY_AND_ASSIGN(Browser); | 130 DISALLOW_COPY_AND_ASSIGN(Browser); |
| 131 }; | 131 }; |
| 132 | 132 |
| 133 } // namespace examples | 133 } // namespace examples |
| 134 } // namespace mojo | 134 } // namespace mojo |
| 135 | 135 |
| 136 MojoResult MojoMain(MojoHandle shell_handle) { | 136 MojoResult MojoMain(MojoHandle application_request) { |
| 137 mojo::ApplicationRunnerChromium runner(new mojo::examples::Browser); | 137 mojo::ApplicationRunnerChromium runner(new mojo::examples::Browser); |
| 138 return runner.Run(shell_handle); | 138 return runner.Run(application_request); |
| 139 } | 139 } |
| OLD | NEW |