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 "services/ui/ws/test_utils.h" | 5 #include "services/ui/ws/test_utils.h" |
6 | 6 |
7 #include "base/memory/ptr_util.h" | 7 #include "base/memory/ptr_util.h" |
8 #include "cc/output/copy_output_request.h" | 8 #include "cc/output/copy_output_request.h" |
9 #include "services/shell/public/interfaces/connector.mojom.h" | 9 #include "services/shell/public/interfaces/connector.mojom.h" |
10 #include "services/ui/surfaces/surfaces_state.h" | 10 #include "services/ui/surfaces/surfaces_state.h" |
(...skipping 148 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
159 uint32_t change_id, | 159 uint32_t change_id, |
160 ClientSpecificId requesting_client_id, | 160 ClientSpecificId requesting_client_id, |
161 mojo::Map<mojo::String, mojo::Array<uint8_t>> properties) { | 161 mojo::Map<mojo::String, mojo::Array<uint8_t>> properties) { |
162 got_create_top_level_window_ = true; | 162 got_create_top_level_window_ = true; |
163 change_id_ = change_id; | 163 change_id_ = change_id; |
164 } | 164 } |
165 | 165 |
166 void TestWindowManager::WmClientJankinessChanged(ClientSpecificId client_id, | 166 void TestWindowManager::WmClientJankinessChanged(ClientSpecificId client_id, |
167 bool janky) {} | 167 bool janky) {} |
168 | 168 |
169 void TestWindowManager::OnAccelerator(uint32_t id, | 169 void TestWindowManager::OnAccelerator(uint32_t ack_id, |
| 170 uint32_t accelerator_id, |
170 std::unique_ptr<ui::Event> event) { | 171 std::unique_ptr<ui::Event> event) { |
171 on_accelerator_called_ = true; | 172 on_accelerator_called_ = true; |
172 on_accelerator_id_ = id; | 173 on_accelerator_id_ = accelerator_id; |
173 } | 174 } |
174 | 175 |
175 // TestWindowTreeClient ------------------------------------------------------- | 176 // TestWindowTreeClient ------------------------------------------------------- |
176 | 177 |
177 TestWindowTreeClient::TestWindowTreeClient() | 178 TestWindowTreeClient::TestWindowTreeClient() |
178 : binding_(this), record_on_change_completed_(false) {} | 179 : binding_(this), record_on_change_completed_(false) {} |
179 TestWindowTreeClient::~TestWindowTreeClient() {} | 180 TestWindowTreeClient::~TestWindowTreeClient() {} |
180 | 181 |
181 void TestWindowTreeClient::Bind( | 182 void TestWindowTreeClient::Bind( |
182 mojo::InterfaceRequest<mojom::WindowTreeClient> request) { | 183 mojo::InterfaceRequest<mojom::WindowTreeClient> request) { |
(...skipping 304 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
487 return nullptr; | 488 return nullptr; |
488 if (!tree->AddWindow(parent_client_id, client_window_id)) | 489 if (!tree->AddWindow(parent_client_id, client_window_id)) |
489 return nullptr; | 490 return nullptr; |
490 *client_id = client_window_id; | 491 *client_id = client_window_id; |
491 return tree->GetWindowByClientId(client_window_id); | 492 return tree->GetWindowByClientId(client_window_id); |
492 } | 493 } |
493 | 494 |
494 } // namespace test | 495 } // namespace test |
495 } // namespace ws | 496 } // namespace ws |
496 } // namespace ui | 497 } // namespace ui |
OLD | NEW |