Chromium Code Reviews| Index: ash/mus/accelerators/accelerator_controller_registrar.h |
| diff --git a/ash/mus/accelerators/accelerator_controller_registrar.h b/ash/mus/accelerators/accelerator_controller_registrar.h |
| index 737c607855c6564b6bda6b7b425e01d14c99a078..da7616fc917bc3d59e01358c45c373b88f1f8577 100644 |
| --- a/ash/mus/accelerators/accelerator_controller_registrar.h |
| +++ b/ash/mus/accelerators/accelerator_controller_registrar.h |
| @@ -45,6 +45,10 @@ class AcceleratorControllerRegistrar : public AcceleratorHandler, |
| private: |
| friend class AcceleratorControllerRegistrarTestApi; |
| + // Accelerators for window cycle. |
| + const ui::Accelerator kWindowCycleCompleteAccelerator; |
|
sky
2017/03/30 20:07:29
These should be unix_hacker_style. Use kFoo when "
|
| + const ui::Accelerator kWindowCycleCancelAccelerator; |
| + |
| // ui::AcceleratorManagerDelegate: |
| void OnAcceleratorsRegistered( |
| const std::vector<ui::Accelerator>& accelerators) override; |
| @@ -57,6 +61,12 @@ class AcceleratorControllerRegistrar : public AcceleratorHandler, |
| const ui::Accelerator& accelerator, |
| std::vector<ui::mojom::WmAcceleratorPtr>& accelerator_vector); |
| + // TODO(moshayedi): crbug.com/629191. Handling window cycle accelerators here |
| + // is just a temporary solution and we should remove these once we have a |
| + // proper solution. |
| + void RegisterWindowCycleAccelerators(); |
| + bool HandleWindowCycleAccelerator(const ui::Accelerator& accelerator); |
| + |
| // The flow of accelerators in ash is: |
| // . wm::AcceleratorFilter() sees events first as it's a pre-target handler. |
| // . AcceleratorFilter forwards to its delegate, which indirectly is |