| Index: ui/base/test/ui_controls_mac.mm
|
| diff --git a/ui/base/test/ui_controls_mac.mm b/ui/base/test/ui_controls_mac.mm
|
| index c0af6900d0c099e284bf9ac4cc6a991e86d25951..70f1e90b4c8600f3bf8681f2e48734512cc187a0 100644
|
| --- a/ui/base/test/ui_controls_mac.mm
|
| +++ b/ui/base/test/ui_controls_mac.mm
|
| @@ -79,6 +79,12 @@ void SynthesizeKeyEventsSequence(NSWindow* window,
|
| DCHECK(event);
|
| events->push_back(event);
|
| }
|
| + if (command) {
|
| + flags |= NSCommandKeyMask;
|
| + event = SynthesizeKeyEvent(window, true, ui::VKEY_COMMAND, flags);
|
| + DCHECK(event);
|
| + events->push_back(event);
|
| + }
|
| if (shift) {
|
| flags |= NSShiftKeyMask;
|
| event = SynthesizeKeyEvent(window, true, ui::VKEY_SHIFT, flags);
|
| @@ -91,12 +97,6 @@ void SynthesizeKeyEventsSequence(NSWindow* window,
|
| DCHECK(event);
|
| events->push_back(event);
|
| }
|
| - if (command) {
|
| - flags |= NSCommandKeyMask;
|
| - event = SynthesizeKeyEvent(window, true, ui::VKEY_COMMAND, flags);
|
| - DCHECK(event);
|
| - events->push_back(event);
|
| - }
|
|
|
| event = SynthesizeKeyEvent(window, true, keycode, flags);
|
| DCHECK(event);
|
| @@ -105,12 +105,6 @@ void SynthesizeKeyEventsSequence(NSWindow* window,
|
| DCHECK(event);
|
| events->push_back(event);
|
|
|
| - if (command) {
|
| - flags &= ~NSCommandKeyMask;
|
| - event = SynthesizeKeyEvent(window, false, ui::VKEY_COMMAND, flags);
|
| - DCHECK(event);
|
| - events->push_back(event);
|
| - }
|
| if (alt) {
|
| flags &= ~NSAlternateKeyMask;
|
| event = SynthesizeKeyEvent(window, false, ui::VKEY_MENU, flags);
|
| @@ -123,6 +117,12 @@ void SynthesizeKeyEventsSequence(NSWindow* window,
|
| DCHECK(event);
|
| events->push_back(event);
|
| }
|
| + if (command) {
|
| + flags &= ~NSCommandKeyMask;
|
| + event = SynthesizeKeyEvent(window, false, ui::VKEY_COMMAND, flags);
|
| + DCHECK(event);
|
| + events->push_back(event);
|
| + }
|
| if (control) {
|
| flags &= ~NSControlKeyMask;
|
| event = SynthesizeKeyEvent(window, false, ui::VKEY_CONTROL, flags);
|
|
|