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/mus/public/cpp/tests/window_server_test_base.h" | 5 #include "services/ui/public/cpp/tests/window_server_test_base.h" |
6 | 6 |
7 #include "base/bind.h" | 7 #include "base/bind.h" |
8 #include "base/location.h" | 8 #include "base/location.h" |
9 #include "base/run_loop.h" | 9 #include "base/run_loop.h" |
10 #include "base/single_thread_task_runner.h" | 10 #include "base/single_thread_task_runner.h" |
11 #include "base/test/test_timeouts.h" | 11 #include "base/test/test_timeouts.h" |
12 #include "base/threading/thread_task_runner_handle.h" | 12 #include "base/threading/thread_task_runner_handle.h" |
13 #include "components/mus/public/cpp/window.h" | |
14 #include "components/mus/public/cpp/window_tree_client.h" | |
15 #include "components/mus/public/cpp/window_tree_host_factory.h" | |
16 #include "services/shell/public/cpp/connector.h" | 13 #include "services/shell/public/cpp/connector.h" |
| 14 #include "services/ui/public/cpp/window.h" |
| 15 #include "services/ui/public/cpp/window_tree_client.h" |
| 16 #include "services/ui/public/cpp/window_tree_host_factory.h" |
17 | 17 |
18 namespace mus { | 18 namespace mus { |
19 namespace { | 19 namespace { |
20 | 20 |
21 base::RunLoop* current_run_loop = nullptr; | 21 base::RunLoop* current_run_loop = nullptr; |
22 | 22 |
23 void TimeoutRunLoop(const base::Closure& timeout_task, bool* timeout) { | 23 void TimeoutRunLoop(const base::Closure& timeout_task, bool* timeout) { |
24 CHECK(current_run_loop); | 24 CHECK(current_run_loop); |
25 *timeout = true; | 25 *timeout = true; |
26 timeout_task.Run(); | 26 timeout_task.Run(); |
(...skipping 108 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
135 if (window_manager_delegate_) | 135 if (window_manager_delegate_) |
136 window_manager_delegate_->OnAccelerator(id, event); | 136 window_manager_delegate_->OnAccelerator(id, event); |
137 } | 137 } |
138 | 138 |
139 void WindowServerTestBase::Create(shell::Connection* connection, | 139 void WindowServerTestBase::Create(shell::Connection* connection, |
140 mojom::WindowTreeClientRequest request) { | 140 mojom::WindowTreeClientRequest request) { |
141 new WindowTreeClient(this, nullptr, std::move(request)); | 141 new WindowTreeClient(this, nullptr, std::move(request)); |
142 } | 142 } |
143 | 143 |
144 } // namespace mus | 144 } // namespace mus |
OLD | NEW |