| Index: ui/aura/test/mus/test_window_tree.h
|
| diff --git a/ui/aura/test/mus/test_window_tree.h b/ui/aura/test/mus/test_window_tree.h
|
| index b0033ef1ceda6fced83b1a1136bac0a7ed9e9250..e216a9019bab4466dab180a97bfe830396b93182 100644
|
| --- a/ui/aura/test/mus/test_window_tree.h
|
| +++ b/ui/aura/test/mus/test_window_tree.h
|
| @@ -7,7 +7,7 @@
|
|
|
| #include <stdint.h>
|
|
|
| -#include <set>
|
| +#include <vector>
|
|
|
| #include "base/macros.h"
|
| #include "services/ui/public/interfaces/window_tree.mojom.h"
|
| @@ -52,6 +52,10 @@ class TestWindowTree : public ui::mojom::WindowTree {
|
|
|
| bool WasEventAcked(uint32_t event_id) const;
|
|
|
| + // Returns the result of the specified event. UNHANDLED if |event_id| was
|
| + // not acked (use WasEventAcked() to determine if the event was acked).
|
| + ui::mojom::EventResult GetEventResult(uint32_t event_id) const;
|
| +
|
| base::Optional<std::vector<uint8_t>> GetLastPropertyValue();
|
|
|
| base::Optional<std::unordered_map<std::string, std::vector<uint8_t>>>
|
| @@ -190,7 +194,11 @@ class TestWindowTree : public ui::mojom::WindowTree {
|
| const gfx::Point& cursor_location) override;
|
| void CancelWindowMove(uint32_t window_id) override;
|
|
|
| - std::set<uint32_t> acked_events_;
|
| + struct AckedEvent {
|
| + uint32_t event_id;
|
| + ui::mojom::EventResult result;
|
| + };
|
| + std::vector<AckedEvent> acked_events_;
|
| uint32_t window_id_ = 0u;
|
|
|
| base::Optional<std::vector<uint8_t>> last_property_value_;
|
|
|