Chromium Code Reviews| Index: ui/base/accelerators/accelerator.cc |
| diff --git a/ui/base/accelerators/accelerator.cc b/ui/base/accelerators/accelerator.cc |
| index 8b8d14e1a5fbee1cef1c0cbd95b1d9f6ac8cecbb..65a857063494fa4695b7f89c4d7e78e710ab4bfa 100644 |
| --- a/ui/base/accelerators/accelerator.cc |
| +++ b/ui/base/accelerators/accelerator.cc |
| @@ -67,6 +67,14 @@ int Accelerator::MaskOutKeyEventFlags(int flags) { |
| return flags & kModifierMask; |
| } |
| +KeyEvent Accelerator::ToKeyEvent() const { |
| + KeyEvent key_event(key_state() == Accelerator::KeyState::PRESSED |
|
sky
2017/07/11 17:19:43
Remove the local and do a return directly.
bruthig
2017/07/11 18:25:21
Done.
|
| + ? ET_KEY_PRESSED |
| + : ET_KEY_RELEASED, |
| + key_code(), modifiers()); |
| + return key_event; |
| +} |
| + |
| Accelerator& Accelerator::operator=(const Accelerator& accelerator) { |
| if (this != &accelerator) { |
| key_code_ = accelerator.key_code_; |