| 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 <cstdlib> | 5 #include <cstdlib> |
| 6 | 6 |
| 7 #include "base/bind.h" | 7 #include "base/bind.h" |
| 8 #include "base/message_loop/message_loop.h" | 8 #include "base/message_loop/message_loop.h" |
| 9 #include "base/threading/thread.h" | 9 #include "base/threading/thread.h" |
| 10 #include "base/time/time.h" | 10 #include "base/time/time.h" |
| (...skipping 131 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 142 } | 142 } |
| 143 | 143 |
| 144 IndirectIntegerServicePtr indirect_integer_service_; | 144 IndirectIntegerServicePtr indirect_integer_service_; |
| 145 std::vector<DemoTask*> tasks_; | 145 std::vector<DemoTask*> tasks_; |
| 146 }; | 146 }; |
| 147 | 147 |
| 148 | 148 |
| 149 } // namespace examples | 149 } // namespace examples |
| 150 } // namespace mojo | 150 } // namespace mojo |
| 151 | 151 |
| 152 MojoResult MojoMain(MojoHandle shell_handle) { | 152 MojoResult MojoMain(MojoHandle application_request) { |
| 153 mojo::ApplicationRunnerChromium runner( | 153 mojo::ApplicationRunnerChromium runner( |
| 154 new mojo::examples::IndirectServiceDemoAppDelegate); | 154 new mojo::examples::IndirectServiceDemoAppDelegate); |
| 155 return runner.Run(shell_handle); | 155 return runner.Run(application_request); |
| 156 } | 156 } |
| OLD | NEW |