| Index: services/ui/ws/event_dispatcher.h
|
| diff --git a/services/ui/ws/event_dispatcher.h b/services/ui/ws/event_dispatcher.h
|
| index 472a0c0e4038d6c0c1af45c7125ee3e1b876985e..777be8c1ea0352cb7110f2244d0f815b1ae3ed57 100644
|
| --- a/services/ui/ws/event_dispatcher.h
|
| +++ b/services/ui/ws/event_dispatcher.h
|
| @@ -14,7 +14,7 @@
|
| #include "base/macros.h"
|
| #include "services/ui/common/types.h"
|
| #include "services/ui/public/interfaces/cursor.mojom.h"
|
| -#include "services/ui/public/interfaces/event_matcher.mojom.h"
|
| +#include "services/ui/public/interfaces/window_manager.mojom.h"
|
| #include "services/ui/ws/drag_cursor_updater.h"
|
| #include "services/ui/ws/modal_window_controller.h"
|
| #include "services/ui/ws/server_window_observer.h"
|
| @@ -122,10 +122,11 @@ class EventDispatcher : public ServerWindowObserver, public DragCursorUpdater {
|
| // ServerWindow* under it.
|
| void UpdateCursorProviderByLastKnownLocation();
|
|
|
| - // Adds an accelerator with the given id and event-matcher. If an accelerator
|
| - // already exists with the same id or the same matcher, then the accelerator
|
| - // is not added. Returns whether adding the accelerator was successful or not.
|
| - bool AddAccelerator(uint32_t id, mojom::EventMatcherPtr event_matcher);
|
| + // Adds the supplied accelerators. If an accelerator with the same id or
|
| + // matcher already exists, skip it. Returns true if all accelerators were
|
| + // added successfully.
|
| + bool AddAccelerators(std::vector<ui::mojom::AcceleratorPtr> accelerators);
|
| +
|
| void RemoveAccelerator(uint32_t id);
|
|
|
| // Processes the supplied event, informing the delegate as approriate. This
|
|
|