| OLD | NEW |
| 1 // Copyright 2015 The Chromium Authors. All rights reserved. | 1 // Copyright 2015 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 "components/web_view/test_runner/test_runner_application_delegate.h" | 5 #include "components/web_view/test_runner/test_runner_application_delegate.h" |
| 6 | 6 |
| 7 #include <iostream> | 7 #include <iostream> |
| 8 #include <utility> | 8 #include <utility> |
| 9 | 9 |
| 10 #include "base/bind.h" | 10 #include "base/bind.h" |
| (...skipping 57 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 68 uint32_t id) { | 68 uint32_t id) { |
| 69 if (!test_runner::BlinkTestPlatformInitialize()) { | 69 if (!test_runner::BlinkTestPlatformInitialize()) { |
| 70 NOTREACHED() << "Test environment could not be properly set up for blink."; | 70 NOTREACHED() << "Test environment could not be properly set up for blink."; |
| 71 } | 71 } |
| 72 shell_ = shell; | 72 shell_ = shell; |
| 73 mus::CreateWindowTreeHost(shell_, this, &host_, nullptr); | 73 mus::CreateWindowTreeHost(shell_, this, &host_, nullptr); |
| 74 } | 74 } |
| 75 | 75 |
| 76 bool TestRunnerApplicationDelegate::AcceptConnection( | 76 bool TestRunnerApplicationDelegate::AcceptConnection( |
| 77 mojo::Connection* connection) { | 77 mojo::Connection* connection) { |
| 78 connection->AddService<web_view::LayoutTestRunner>(this); | 78 connection->AddInterface<web_view::LayoutTestRunner>(this); |
| 79 return true; | 79 return true; |
| 80 } | 80 } |
| 81 | 81 |
| 82 //////////////////////////////////////////////////////////////////////////////// | 82 //////////////////////////////////////////////////////////////////////////////// |
| 83 // mus::WindowTreeDelegate implementation: | 83 // mus::WindowTreeDelegate implementation: |
| 84 | 84 |
| 85 void TestRunnerApplicationDelegate::OnEmbed(mus::Window* root) { | 85 void TestRunnerApplicationDelegate::OnEmbed(mus::Window* root) { |
| 86 root_ = root; | 86 root_ = root; |
| 87 | 87 |
| 88 // If this is a sys-check, then terminate in the next cycle. | 88 // If this is a sys-check, then terminate in the next cycle. |
| (...skipping 68 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 157 //////////////////////////////////////////////////////////////////////////////// | 157 //////////////////////////////////////////////////////////////////////////////// |
| 158 // mojo::InterfaceFactory<LayoutTestRunner> implementation: | 158 // mojo::InterfaceFactory<LayoutTestRunner> implementation: |
| 159 | 159 |
| 160 void TestRunnerApplicationDelegate::Create( | 160 void TestRunnerApplicationDelegate::Create( |
| 161 mojo::Connection* connection, | 161 mojo::Connection* connection, |
| 162 mojo::InterfaceRequest<web_view::LayoutTestRunner> request) { | 162 mojo::InterfaceRequest<web_view::LayoutTestRunner> request) { |
| 163 layout_test_runner_.AddBinding(this, std::move(request)); | 163 layout_test_runner_.AddBinding(this, std::move(request)); |
| 164 } | 164 } |
| 165 | 165 |
| 166 } // namespace web_view | 166 } // namespace web_view |
| OLD | NEW |