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

Unified Diff: ui/views/test/event_generator_delegate_mac.mm

Issue 2531033003: MacViews: Fix GlobalKeyboardShortcutsTest.SwitchTabsMac. (Closed)
Patch Set: Created 4 years, 1 month 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/views/test/event_generator_delegate_mac.mm
diff --git a/ui/views/test/event_generator_delegate_mac.mm b/ui/views/test/event_generator_delegate_mac.mm
index bc17c3773f487fd146a966243b9fc0c7e64156e5..6b89e242cbde88661a806fddde4757cf4d41fe9f 100644
--- a/ui/views/test/event_generator_delegate_mac.mm
+++ b/ui/views/test/event_generator_delegate_mac.mm
@@ -401,6 +401,13 @@ void EventGeneratorDelegateMac::OnKeyEvent(ui::KeyEvent* event) {
[NSApp sendEvent:ns_event];
break;
case Target::WINDOW:
+ // -[NSApp sendEvent:] sends -performKeyEquivalent: if Command or Control
+ // modifiers are pressed. Emulate that behavior.
+ if ([ns_event type] == NSKeyDown &&
+ [ns_event modifierFlags] & (NSControlKeyMask | NSCommandKeyMask) &&
tapted 2016/11/28 08:14:18 nit: extra parens around the bitwise operation
themblsha 2016/11/30 12:35:33 Done. I think performKeyEquivalent: emulation is a
tapted 2016/11/30 23:52:03 I agree - I like it too :)
+ [window_ performKeyEquivalent:ns_event])
+ break; // Handled by performKeyEquivalent:.
+
[window_ sendEvent:ns_event];
break;
case Target::WIDGET:

Powered by Google App Engine
This is Rietveld 408576698