| 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/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" |
| (...skipping 136 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 147 window_manager_delegate_->OnWmCancelMoveLoop(window); | 147 window_manager_delegate_->OnWmCancelMoveLoop(window); |
| 148 } | 148 } |
| 149 | 149 |
| 150 mojom::EventResult WindowServerTestBase::OnAccelerator(uint32_t accelerator_id, | 150 mojom::EventResult WindowServerTestBase::OnAccelerator(uint32_t accelerator_id, |
| 151 const ui::Event& event) { | 151 const ui::Event& event) { |
| 152 return window_manager_delegate_ | 152 return window_manager_delegate_ |
| 153 ? window_manager_delegate_->OnAccelerator(accelerator_id, event) | 153 ? window_manager_delegate_->OnAccelerator(accelerator_id, event) |
| 154 : mojom::EventResult::UNHANDLED; | 154 : mojom::EventResult::UNHANDLED; |
| 155 } | 155 } |
| 156 | 156 |
| 157 void WindowServerTestBase::Create(shell::Connection* connection, | 157 void WindowServerTestBase::Create(const shell::Identity& remote_identity, |
| 158 mojom::WindowTreeClientRequest request) { | 158 mojom::WindowTreeClientRequest request) { |
| 159 new WindowTreeClient(this, nullptr, std::move(request)); | 159 new WindowTreeClient(this, nullptr, std::move(request)); |
| 160 } | 160 } |
| 161 | 161 |
| 162 } // namespace ui | 162 } // namespace ui |
| OLD | NEW |