Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(797)

Unified Diff: ui/base/accelerators/accelerator.cc

Issue 2953643002: Replaced synthetic MouseEvent in CustomButton::AcceleratorPressed() with just an Event. (Closed)
Patch Set: Changed ui::Event to ui::KeyEvent. Created 3 years, 5 months ago
Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.
Jump to:
View side-by-side diff with in-line comments
Download patch
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_;

Powered by Google App Engine
This is Rietveld 408576698