| OLD | NEW |
| 1 // Copyright 2016 The Chromium Authors. All rights reserved. | 1 // Copyright 2016 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/ws/test_utils.h" | 5 #include "components/mus/ws/test_utils.h" |
| 6 | 6 |
| 7 #include "cc/output/copy_output_request.h" | 7 #include "cc/output/copy_output_request.h" |
| 8 #include "components/mus/surfaces/surfaces_state.h" | 8 #include "components/mus/surfaces/surfaces_state.h" |
| 9 #include "components/mus/ws/display_binding.h" | 9 #include "components/mus/ws/display_binding.h" |
| 10 #include "components/mus/ws/window_manager_access_policy.h" | 10 #include "components/mus/ws/window_manager_access_policy.h" |
| (...skipping 238 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 249 void TestWindowTreeClient::OnWindowSharedPropertyChanged( | 249 void TestWindowTreeClient::OnWindowSharedPropertyChanged( |
| 250 uint32_t window, | 250 uint32_t window, |
| 251 const mojo::String& name, | 251 const mojo::String& name, |
| 252 mojo::Array<uint8_t> new_data) { | 252 mojo::Array<uint8_t> new_data) { |
| 253 tracker_.OnWindowSharedPropertyChanged(window, name, std::move(new_data)); | 253 tracker_.OnWindowSharedPropertyChanged(window, name, std::move(new_data)); |
| 254 } | 254 } |
| 255 | 255 |
| 256 void TestWindowTreeClient::OnWindowInputEvent(uint32_t event_id, | 256 void TestWindowTreeClient::OnWindowInputEvent(uint32_t event_id, |
| 257 uint32_t window, | 257 uint32_t window, |
| 258 mojom::EventPtr event) { | 258 mojom::EventPtr event) { |
| 259 tracker_.OnWindowInputEvent(window, std::move(event)); | 259 tracker_.OnWindowInputEvent(event_id, window, std::move(event)); |
| 260 } | 260 } |
| 261 | 261 |
| 262 void TestWindowTreeClient::OnWindowFocused(uint32_t focused_window_id) { | 262 void TestWindowTreeClient::OnWindowFocused(uint32_t focused_window_id) { |
| 263 tracker_.OnWindowFocused(focused_window_id); | 263 tracker_.OnWindowFocused(focused_window_id); |
| 264 } | 264 } |
| 265 | 265 |
| 266 void TestWindowTreeClient::OnWindowPredefinedCursorChanged( | 266 void TestWindowTreeClient::OnWindowPredefinedCursorChanged( |
| 267 uint32_t window_id, | 267 uint32_t window_id, |
| 268 mojom::Cursor cursor_id) { | 268 mojom::Cursor cursor_id) { |
| 269 tracker_.OnWindowPredefinedCursorChanged(window_id, cursor_id); | 269 tracker_.OnWindowPredefinedCursorChanged(window_id, cursor_id); |
| (...skipping 93 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 363 return nullptr; | 363 return nullptr; |
| 364 if (!tree->AddWindow(parent_client_id, client_window_id)) | 364 if (!tree->AddWindow(parent_client_id, client_window_id)) |
| 365 return nullptr; | 365 return nullptr; |
| 366 *client_id = client_window_id; | 366 *client_id = client_window_id; |
| 367 return tree->GetWindowByClientId(client_window_id); | 367 return tree->GetWindowByClientId(client_window_id); |
| 368 } | 368 } |
| 369 | 369 |
| 370 } // namespace test | 370 } // namespace test |
| 371 } // namespace ws | 371 } // namespace ws |
| 372 } // namespace mus | 372 } // namespace mus |
| OLD | NEW |