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

Side by Side Diff: ui/events/cocoa/events_mac_unittest.mm

Issue 1559163002: Clean up event flags a bit: (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: Review comment Created 4 years, 11 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 unified diff | Download patch
« no previous file with comments | « ui/events/cocoa/cocoa_event_utils.mm ('k') | ui/events/event.h » ('j') | no next file with comments »
Toggle Intra-line Diffs ('i') | Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
OLDNEW
1 // Copyright 2014 The Chromium Authors. All rights reserved. 1 // Copyright 2014 The Chromium Authors. All rights reserved.
2 // Use of this source code is governed by a BSD-style license that can be 2 // Use of this source code is governed by a BSD-style license that can be
3 // found in the LICENSE file. 3 // found in the LICENSE file.
4 4
5 #include "ui/events/event_utils.h" 5 #include "ui/events/event_utils.h"
6 6
7 #import <Cocoa/Cocoa.h> 7 #import <Cocoa/Cocoa.h>
8 #include <stdint.h> 8 #include <stdint.h>
9 9
10 #include "base/mac/scoped_cftyperef.h" 10 #include "base/mac/scoped_cftyperef.h"
(...skipping 125 matching lines...) Expand 10 before | Expand all | Expand 10 after
136 EXPECT_EQ(EF_RIGHT_MOUSE_BUTTON, EventFlagsFromNative(right)); 136 EXPECT_EQ(EF_RIGHT_MOUSE_BUTTON, EventFlagsFromNative(right));
137 137
138 // Middle click. 138 // Middle click.
139 NSEvent* middle = cocoa_test_event_utils::MouseEventWithType(NSOtherMouseUp, 139 NSEvent* middle = cocoa_test_event_utils::MouseEventWithType(NSOtherMouseUp,
140 0); 140 0);
141 EXPECT_EQ(EF_MIDDLE_MOUSE_BUTTON, EventFlagsFromNative(middle)); 141 EXPECT_EQ(EF_MIDDLE_MOUSE_BUTTON, EventFlagsFromNative(middle));
142 142
143 // Caps + Left 143 // Caps + Left
144 NSEvent* caps = cocoa_test_event_utils::MouseEventWithType( 144 NSEvent* caps = cocoa_test_event_utils::MouseEventWithType(
145 NSLeftMouseUp, NSAlphaShiftKeyMask); 145 NSLeftMouseUp, NSAlphaShiftKeyMask);
146 EXPECT_EQ(EF_LEFT_MOUSE_BUTTON | EF_CAPS_LOCK_DOWN, 146 EXPECT_EQ(EF_LEFT_MOUSE_BUTTON | EF_CAPS_LOCK_ON, EventFlagsFromNative(caps));
147 EventFlagsFromNative(caps));
148 147
149 // Shift + Left 148 // Shift + Left
150 NSEvent* shift = cocoa_test_event_utils::MouseEventWithType(NSLeftMouseUp, 149 NSEvent* shift = cocoa_test_event_utils::MouseEventWithType(NSLeftMouseUp,
151 NSShiftKeyMask); 150 NSShiftKeyMask);
152 EXPECT_EQ(EF_LEFT_MOUSE_BUTTON | EF_SHIFT_DOWN, EventFlagsFromNative(shift)); 151 EXPECT_EQ(EF_LEFT_MOUSE_BUTTON | EF_SHIFT_DOWN, EventFlagsFromNative(shift));
153 152
154 // Ctrl + Left 153 // Ctrl + Left
155 NSEvent* ctrl = cocoa_test_event_utils::MouseEventWithType(NSLeftMouseUp, 154 NSEvent* ctrl = cocoa_test_event_utils::MouseEventWithType(NSLeftMouseUp,
156 NSControlKeyMask); 155 NSControlKeyMask);
157 EXPECT_EQ(EF_LEFT_MOUSE_BUTTON | EF_CONTROL_DOWN, EventFlagsFromNative(ctrl)); 156 EXPECT_EQ(EF_LEFT_MOUSE_BUTTON | EF_CONTROL_DOWN, EventFlagsFromNative(ctrl));
(...skipping 149 matching lines...) Expand 10 before | Expand all | Expand 10 after
307 event = cocoa_test_event_utils::MouseEventWithType(NSMouseMoved, 0); 306 event = cocoa_test_event_utils::MouseEventWithType(NSMouseMoved, 0);
308 EXPECT_EQ(ui::ET_MOUSE_MOVED, ui::EventTypeFromNative(event)); 307 EXPECT_EQ(ui::ET_MOUSE_MOVED, ui::EventTypeFromNative(event));
309 308
310 event = cocoa_test_event_utils::EnterEvent(); 309 event = cocoa_test_event_utils::EnterEvent();
311 EXPECT_EQ(ui::ET_MOUSE_ENTERED, ui::EventTypeFromNative(event)); 310 EXPECT_EQ(ui::ET_MOUSE_ENTERED, ui::EventTypeFromNative(event));
312 event = cocoa_test_event_utils::ExitEvent(); 311 event = cocoa_test_event_utils::ExitEvent();
313 EXPECT_EQ(ui::ET_MOUSE_EXITED, ui::EventTypeFromNative(event)); 312 EXPECT_EQ(ui::ET_MOUSE_EXITED, ui::EventTypeFromNative(event));
314 } 313 }
315 314
316 } // namespace ui 315 } // namespace ui
OLDNEW
« no previous file with comments | « ui/events/cocoa/cocoa_event_utils.mm ('k') | ui/events/event.h » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698