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

Unified Diff: ui/events/cocoa/events_mac_unittest.mm

Issue 2025943003: MacViews: Treat Ctrl+LeftClick as RightClick on Mac. (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@20160520-Enums-MakeThemInt-HeaderChanges-ROLLUP
Patch Set: Remove control flag Created 4 years, 7 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
« no previous file with comments | « ui/events/cocoa/cocoa_event_utils.mm ('k') | no next file » | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: ui/events/cocoa/events_mac_unittest.mm
diff --git a/ui/events/cocoa/events_mac_unittest.mm b/ui/events/cocoa/events_mac_unittest.mm
index 56f9bdd21dd8843f8d2c956ee94fbb3ae8cb3491..8c72a300f4016b55ce3cb922a780673dadd2c034 100644
--- a/ui/events/cocoa/events_mac_unittest.mm
+++ b/ui/events/cocoa/events_mac_unittest.mm
@@ -153,10 +153,16 @@ TEST_F(EventsMacTest, EventFlagsFromNative) {
NSShiftKeyMask);
EXPECT_EQ(EF_LEFT_MOUSE_BUTTON | EF_SHIFT_DOWN, EventFlagsFromNative(shift));
- // Ctrl + Left
+ // Ctrl + Left. Note we map this to a right click on Mac and remove Control.
NSEvent* ctrl = cocoa_test_event_utils::MouseEventWithType(NSLeftMouseUp,
NSControlKeyMask);
- EXPECT_EQ(EF_LEFT_MOUSE_BUTTON | EF_CONTROL_DOWN, EventFlagsFromNative(ctrl));
+ EXPECT_EQ(EF_RIGHT_MOUSE_BUTTON, EventFlagsFromNative(ctrl));
+
+ // Ctrl + Right. Remains a right click.
+ NSEvent* ctrl_right = cocoa_test_event_utils::MouseEventWithType(
+ NSRightMouseUp, NSControlKeyMask);
+ EXPECT_EQ(EF_RIGHT_MOUSE_BUTTON | EF_CONTROL_DOWN,
+ EventFlagsFromNative(ctrl_right));
// Alt + Left
NSEvent* alt = cocoa_test_event_utils::MouseEventWithType(NSLeftMouseUp,
@@ -168,10 +174,10 @@ TEST_F(EventsMacTest, EventFlagsFromNative) {
NSCommandKeyMask);
EXPECT_EQ(EF_LEFT_MOUSE_BUTTON | EF_COMMAND_DOWN, EventFlagsFromNative(cmd));
- // Shift + Ctrl + Left
+ // Shift + Ctrl + Left. Also mapped to a right-click. Control removed.
NSEvent* shiftctrl = cocoa_test_event_utils::MouseEventWithType(
NSLeftMouseUp, NSShiftKeyMask | NSControlKeyMask);
- EXPECT_EQ(EF_LEFT_MOUSE_BUTTON | EF_SHIFT_DOWN | EF_CONTROL_DOWN,
+ EXPECT_EQ(EF_RIGHT_MOUSE_BUTTON | EF_SHIFT_DOWN,
EventFlagsFromNative(shiftctrl));
// Cmd + Alt + Right
« no previous file with comments | « ui/events/cocoa/cocoa_event_utils.mm ('k') | no next file » | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698