| 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 <iostream> | 5 #include <iostream> |
| 6 #include "base/bind.h" | 6 #include "base/bind.h" |
| 7 #include "base/memory/weak_ptr.h" | 7 #include "base/memory/weak_ptr.h" |
| 8 #include "mojo/application/application_runner_chromium.h" | 8 #include "mojo/application/application_runner_chromium.h" |
| 9 #include "mojo/public/c/system/main.h" | 9 #include "mojo/public/c/system/main.h" |
| 10 #include "mojo/public/cpp/application/application_delegate.h" | 10 #include "mojo/public/cpp/application/application_delegate.h" |
| (...skipping 147 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 158 scoped_ptr<TestRunner> test_runner_; | 158 scoped_ptr<TestRunner> test_runner_; |
| 159 | 159 |
| 160 base::WeakPtrFactory<SkyTester> weak_ptr_factory_; | 160 base::WeakPtrFactory<SkyTester> weak_ptr_factory_; |
| 161 | 161 |
| 162 DISALLOW_COPY_AND_ASSIGN(SkyTester); | 162 DISALLOW_COPY_AND_ASSIGN(SkyTester); |
| 163 }; | 163 }; |
| 164 | 164 |
| 165 } // namespace tester | 165 } // namespace tester |
| 166 } // namespace examples | 166 } // namespace examples |
| 167 | 167 |
| 168 MojoResult MojoMain(MojoHandle shell_handle) { | 168 MojoResult MojoMain(MojoHandle application_request) { |
| 169 mojo::ApplicationRunnerChromium runner(new sky::tester::SkyTester); | 169 mojo::ApplicationRunnerChromium runner(new sky::tester::SkyTester); |
| 170 return runner.Run(shell_handle); | 170 return runner.Run(application_request); |
| 171 } | 171 } |
| OLD | NEW |