| 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 "services/ui/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/memory/ptr_util.h" | 9 #include "base/memory/ptr_util.h" |
| 10 #include "base/run_loop.h" | 10 #include "base/run_loop.h" |
| 11 #include "base/single_thread_task_runner.h" | 11 #include "base/single_thread_task_runner.h" |
| 12 #include "base/test/test_timeouts.h" | 12 #include "base/test/test_timeouts.h" |
| 13 #include "base/threading/thread_task_runner_handle.h" | 13 #include "base/threading/thread_task_runner_handle.h" |
| 14 #include "services/shell/public/cpp/connector.h" | 14 #include "services/service_manager/public/cpp/connector.h" |
| 15 #include "services/ui/public/cpp/window.h" | 15 #include "services/ui/public/cpp/window.h" |
| 16 #include "services/ui/public/cpp/window_tree_client.h" | 16 #include "services/ui/public/cpp/window_tree_client.h" |
| 17 #include "services/ui/public/cpp/window_tree_host_factory.h" | 17 #include "services/ui/public/cpp/window_tree_host_factory.h" |
| 18 | 18 |
| 19 namespace ui { | 19 namespace ui { |
| 20 namespace { | 20 namespace { |
| 21 | 21 |
| 22 base::RunLoop* current_run_loop = nullptr; | 22 base::RunLoop* current_run_loop = nullptr; |
| 23 | 23 |
| 24 void TimeoutRunLoop(const base::Closure& timeout_task, bool* timeout) { | 24 void TimeoutRunLoop(const base::Closure& timeout_task, bool* timeout) { |
| (...skipping 156 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 181 : mojom::EventResult::UNHANDLED; | 181 : mojom::EventResult::UNHANDLED; |
| 182 } | 182 } |
| 183 | 183 |
| 184 void WindowServerTestBase::Create(const shell::Identity& remote_identity, | 184 void WindowServerTestBase::Create(const shell::Identity& remote_identity, |
| 185 mojom::WindowTreeClientRequest request) { | 185 mojom::WindowTreeClientRequest request) { |
| 186 window_tree_clients_.insert( | 186 window_tree_clients_.insert( |
| 187 base::MakeUnique<WindowTreeClient>(this, nullptr, std::move(request))); | 187 base::MakeUnique<WindowTreeClient>(this, nullptr, std::move(request))); |
| 188 } | 188 } |
| 189 | 189 |
| 190 } // namespace ui | 190 } // namespace ui |
| OLD | NEW |