Chromium Code Reviews| Index: services/ui/ws/test_utils.h |
| diff --git a/services/ui/ws/test_utils.h b/services/ui/ws/test_utils.h |
| index dc2803dd8fa216b48d3b7ec9070a5b474b5ac5eb..1645b5475bdd5bd4aadfaf320678f30af0afb968 100644 |
| --- a/services/ui/ws/test_utils.h |
| +++ b/services/ui/ws/test_utils.h |
| @@ -207,7 +207,7 @@ class WindowManagerStateTestApi { |
| void DispatchInputEventToWindow(ServerWindow* target, |
| ClientSpecificId client_id, |
| - const int64_t display_id, |
| + int64_t display_id, |
| const ui::Event& event, |
| Accelerator* accelerator) { |
| wms_->DispatchInputEventToWindow(target, client_id, display_id, event, |
| @@ -233,19 +233,22 @@ class WindowManagerStateTestApi { |
| } |
| WindowTree* tree_awaiting_input_ack() { |
| - return wms_->in_flight_event_details_ ? wms_->in_flight_event_details_->tree |
| - : nullptr; |
| + return wms_->in_flight_event_dispatch_details_ |
| + ? wms_->in_flight_event_dispatch_details_->tree |
| + : nullptr; |
| } |
| + bool event_queue_empty() { return wms_->event_queue_.empty(); } |
|
sky
2017/06/07 17:05:07
is_event_queue_empty() const
riajiang
2017/06/07 18:15:04
Done.
|
| + |
| const std::vector<std::unique_ptr<WindowManagerDisplayRoot>>& |
| window_manager_display_roots() const { |
| return wms_->window_manager_display_roots_; |
| } |
| bool AckInFlightEvent(mojom::EventResult result) { |
| - if (!wms_->in_flight_event_details_) |
| + if (!wms_->in_flight_event_dispatch_details_) |
| return false; |
| - wms_->OnEventAck(wms_->in_flight_event_details_->tree, result); |
| + wms_->OnEventAck(wms_->in_flight_event_dispatch_details_->tree, result); |
| return true; |
| } |