OLD | NEW |
1 // Copyright (c) 2012 The Chromium Authors. All rights reserved. | 1 // Copyright (c) 2012 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 "ui/aura/test/aura_test_base.h" | 5 #include "ui/aura/test/aura_test_base.h" |
6 | 6 |
7 #include "ui/aura/client/window_parenting_client.h" | 7 #include "ui/aura/client/window_parenting_client.h" |
8 #include "ui/aura/mus/property_utils.h" | 8 #include "ui/aura/mus/property_utils.h" |
9 #include "ui/aura/mus/window_tree_client.h" | 9 #include "ui/aura/mus/window_tree_client.h" |
10 #include "ui/aura/mus/window_tree_host_mus.h" | 10 #include "ui/aura/mus/window_tree_host_mus.h" |
(...skipping 188 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
199 if (iter->get() == window_tree_host) { | 199 if (iter->get() == window_tree_host) { |
200 window_tree_hosts_.erase(iter); | 200 window_tree_hosts_.erase(iter); |
201 return; | 201 return; |
202 } | 202 } |
203 } | 203 } |
204 NOTREACHED(); | 204 NOTREACHED(); |
205 } | 205 } |
206 | 206 |
207 void AuraTestBase::OnWmDisplayModified(const display::Display& display) {} | 207 void AuraTestBase::OnWmDisplayModified(const display::Display& display) {} |
208 | 208 |
209 ui::mojom::EventResult AuraTestBase::OnAccelerator(uint32_t id, | 209 ui::mojom::EventResult AuraTestBase::OnAccelerator( |
210 const ui::Event& event) { | 210 uint32_t id, |
| 211 const ui::Event& event, |
| 212 std::unordered_map<std::string, std::vector<uint8_t>>* properties) { |
211 return ui::mojom::EventResult::HANDLED; | 213 return ui::mojom::EventResult::HANDLED; |
212 } | 214 } |
213 | 215 |
214 void AuraTestBase::OnWmPerformMoveLoop( | 216 void AuraTestBase::OnWmPerformMoveLoop( |
215 Window* window, | 217 Window* window, |
216 ui::mojom::MoveLoopSource source, | 218 ui::mojom::MoveLoopSource source, |
217 const gfx::Point& cursor_location, | 219 const gfx::Point& cursor_location, |
218 const base::Callback<void(bool)>& on_done) {} | 220 const base::Callback<void(bool)>& on_done) {} |
219 | 221 |
220 void AuraTestBase::OnWmCancelMoveLoop(Window* window) {} | 222 void AuraTestBase::OnWmCancelMoveLoop(Window* window) {} |
(...skipping 28 matching lines...) Expand all Loading... |
249 | 251 |
250 AuraTestBaseMus::~AuraTestBaseMus() {} | 252 AuraTestBaseMus::~AuraTestBaseMus() {} |
251 | 253 |
252 void AuraTestBaseMus::SetUp() { | 254 void AuraTestBaseMus::SetUp() { |
253 ConfigureBackend(test::BackendType::MUS); | 255 ConfigureBackend(test::BackendType::MUS); |
254 AuraTestBase::SetUp(); | 256 AuraTestBase::SetUp(); |
255 } | 257 } |
256 | 258 |
257 } // namespace test | 259 } // namespace test |
258 } // namespace aura | 260 } // namespace aura |
OLD | NEW |