Chromium Code Reviews| Index: ui/base/accelerators/accelerator.h |
| diff --git a/ui/base/accelerators/accelerator.h b/ui/base/accelerators/accelerator.h |
| index f5ee41709ccf41896dd6f2c49ebe26d79c0fa52d..27b2e1a1de4a710a312c4dbb923103e9bd3dac54 100644 |
| --- a/ui/base/accelerators/accelerator.h |
| +++ b/ui/base/accelerators/accelerator.h |
| @@ -89,6 +89,14 @@ class UI_BASE_EXPORT Accelerator { |
| return platform_accelerator_.get(); |
| } |
| + void set_interrupted_by_mouse_event(bool interrupted_by_mouse_event) { |
| + interrupted_by_mouse_event_ = interrupted_by_mouse_event; |
| + } |
| + |
| + bool is_interrupted_by_mouse_event() const { |
|
oshima
2017/07/07 22:28:41
nit: interrupted_by_mouse_event()
(or you can ren
weidongg
2017/07/07 22:55:31
Done.
|
| + return interrupted_by_mouse_event_; |
| + } |
| + |
| private: |
| // The keycode (VK_...). |
| KeyboardCode key_code_; |
| @@ -102,6 +110,13 @@ class UI_BASE_EXPORT Accelerator { |
| // TODO: this is only used in Mac code and should be removed from here. |
| // http://crbug.com/702823. |
| std::unique_ptr<PlatformAccelerator> platform_accelerator_; |
| + |
| + // Whether the accelerator is interrupted by a mouse press/release. This is |
| + // optionally used by AcceleratorController. Even this is set to true, the |
| + // accelerator may still be handled successfully. (Currently only |
| + // TOGGLE_APP_LIST is disabled when mouse press/release occurs between |
| + // search key down and up. See crbug.com/665897) |
| + bool interrupted_by_mouse_event_; |
| }; |
| // An interface that classes that want to register for keyboard accelerators |