| 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" |
| 11 #include "mojo/public/cpp/application/application_impl.h" | 11 #include "mojo/public/cpp/application/application_impl.h" |
| 12 #include "mojo/public/cpp/application/connect.h" | 12 #include "mojo/public/cpp/application/connect.h" |
| 13 #include "mojo/public/cpp/application/service_provider_impl.h" | 13 #include "mojo/public/cpp/application/service_provider_impl.h" |
| 14 #include "mojo/services/public/cpp/view_manager/view_manager.h" | 14 #include "mojo/services/public/cpp/view_manager/view_manager.h" |
| 15 #include "mojo/services/public/cpp/view_manager/view_manager_delegate.h" | 15 #include "mojo/services/public/cpp/view_manager/view_manager_delegate.h" |
| 16 #include "mojo/services/public/cpp/view_manager/view_observer.h" | 16 #include "mojo/services/public/cpp/view_manager/view_observer.h" |
| 17 #include "mojo/services/public/interfaces/input_events/input_events.mojom.h" | 17 #include "mojo/services/public/interfaces/input_events/input_events.mojom.h" |
| 18 #include "mojo/services/window_manager/window_manager_app.h" | 18 #include "services/window_manager/window_manager_app.h" |
| 19 #include "mojo/services/window_manager/window_manager_delegate.h" | 19 #include "services/window_manager/window_manager_delegate.h" |
| 20 #include "sky/tools/tester/test_runner.h" | 20 #include "sky/tools/tester/test_runner.h" |
| 21 | 21 |
| 22 namespace sky { | 22 namespace sky { |
| 23 namespace tester { | 23 namespace tester { |
| 24 namespace { | 24 namespace { |
| 25 | 25 |
| 26 std::string WaitForURL() { | 26 std::string WaitForURL() { |
| 27 std::string url; | 27 std::string url; |
| 28 std::cin >> url; | 28 std::cin >> url; |
| 29 return url; | 29 return url; |
| (...skipping 110 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 140 DISALLOW_COPY_AND_ASSIGN(SkyTester); | 140 DISALLOW_COPY_AND_ASSIGN(SkyTester); |
| 141 }; | 141 }; |
| 142 | 142 |
| 143 } // namespace tester | 143 } // namespace tester |
| 144 } // namespace examples | 144 } // namespace examples |
| 145 | 145 |
| 146 MojoResult MojoMain(MojoHandle shell_handle) { | 146 MojoResult MojoMain(MojoHandle shell_handle) { |
| 147 mojo::ApplicationRunnerChromium runner(new sky::tester::SkyTester); | 147 mojo::ApplicationRunnerChromium runner(new sky::tester::SkyTester); |
| 148 return runner.Run(shell_handle); | 148 return runner.Run(shell_handle); |
| 149 } | 149 } |
| OLD | NEW |