| Index: components/mus/ws/window_manager_state.h
|
| diff --git a/components/mus/ws/window_manager_state.h b/components/mus/ws/window_manager_state.h
|
| index b53885e9dea2cf13cbb07bc94ad353a50669a582..e38641deb539f8e572b9ffc3f4efbfe9be6d6109 100644
|
| --- a/components/mus/ws/window_manager_state.h
|
| +++ b/components/mus/ws/window_manager_state.h
|
| @@ -96,9 +96,9 @@ class WindowManagerState : public EventDispatcherDelegate {
|
| void ProcessEvent(const ui::Event& event);
|
|
|
| // Called when the ack from an event dispatched to WindowTree |tree| is
|
| - // received. When |handled| is true, the client consumed the event.
|
| + // received.
|
| // TODO(sky): make this private and use a callback.
|
| - void OnEventAck(mojom::WindowTree* tree, bool handled);
|
| + void OnEventAck(mojom::WindowTree* tree, mojom::EventResult result);
|
|
|
| // Returns a mojom::Display for the specified display. WindowManager specific
|
| // values are not set.
|
| @@ -149,7 +149,7 @@ class WindowManagerState : public EventDispatcherDelegate {
|
| // Dispatches the event to the appropriate client and starts the ack timer.
|
| void DispatchInputEventToWindowImpl(ServerWindow* target,
|
| bool in_nonclient_area,
|
| - const ui::Event& event,
|
| + const ui::Event& transformed_event,
|
| base::WeakPtr<Accelerator> accelerator);
|
|
|
| // EventDispatcherDelegate:
|
| @@ -161,7 +161,7 @@ class WindowManagerState : public EventDispatcherDelegate {
|
| void OnServerWindowCaptureLost(ServerWindow* window) override;
|
| void DispatchInputEventToWindow(ServerWindow* target,
|
| bool in_nonclient_area,
|
| - const ui::Event& event,
|
| + const ui::Event& transformed_event,
|
| Accelerator* accelerator) override;
|
|
|
| Display* display_;
|
|
|