| Index: ui/base/accelerators/accelerator_manager.h
|
| diff --git a/ui/base/accelerators/accelerator_manager.h b/ui/base/accelerators/accelerator_manager.h
|
| index 9db9629fd8ecc8a9aabf7fa974fe15f1af2cdd75..c792b181f91d691ef8381582ad0450fa682893a7 100644
|
| --- a/ui/base/accelerators/accelerator_manager.h
|
| +++ b/ui/base/accelerators/accelerator_manager.h
|
| @@ -8,6 +8,7 @@
|
| #include <list>
|
| #include <map>
|
| #include <utility>
|
| +#include <vector>
|
|
|
| #include "base/macros.h"
|
| #include "ui/base/accelerators/accelerator.h"
|
| @@ -30,10 +31,10 @@ class UI_BASE_EXPORT AcceleratorManager {
|
| explicit AcceleratorManager(AcceleratorManagerDelegate* = nullptr);
|
| ~AcceleratorManager();
|
|
|
| - // Register a keyboard accelerator for the specified target. If multiple
|
| + // Register keyboard accelerators for the specified target. If multiple
|
| // targets are registered for an accelerator, a target registered later has
|
| // higher priority.
|
| - // |accelerator| is the accelerator to register.
|
| + // |accelerators| contains accelerators to register.
|
| // |priority| denotes the priority of the handler.
|
| // NOTE: In almost all cases, you should specify kNormalPriority for this
|
| // parameter. Setting it to kHighPriority prevents Chrome from sending the
|
| @@ -47,10 +48,18 @@ class UI_BASE_EXPORT AcceleratorManager {
|
| // - the enter key
|
| // - any F key (F1, F2, F3 ...)
|
| // - any browser specific keys (as available on special keyboards)
|
| - void Register(const Accelerator& accelerator,
|
| + void Register(const std::vector<ui::Accelerator>& accelerators,
|
| HandlerPriority priority,
|
| AcceleratorTarget* target);
|
|
|
| + // Registers a keyboard accelerator for the specified target. This function
|
| + // calls the function Register() with vector argument above.
|
| + inline void RegisterAccelerator(const Accelerator& accelerator,
|
| + HandlerPriority priority,
|
| + AcceleratorTarget* target) {
|
| + Register({accelerator}, priority, target);
|
| + }
|
| +
|
| // Unregister the specified keyboard accelerator for the specified target.
|
| void Unregister(const Accelerator& accelerator, AcceleratorTarget* target);
|
|
|
|
|