| Index: ui/base/cocoa/cocoa_base_utils_unittest.mm
|
| diff --git a/ui/base/cocoa/cocoa_base_utils_unittest.mm b/ui/base/cocoa/cocoa_base_utils_unittest.mm
|
| index f379120e2bfb782a213b45f941d23d8be272dd03..a2b64a55c6e4526d89c3e68c57cb97689cfeb744 100644
|
| --- a/ui/base/cocoa/cocoa_base_utils_unittest.mm
|
| +++ b/ui/base/cocoa/cocoa_base_utils_unittest.mm
|
| @@ -32,11 +32,13 @@ class CocoaBaseUtilsTest : public CocoaTest {
|
| TEST_F(CocoaBaseUtilsTest, WindowOpenDispositionFromNSEvent) {
|
| // Left Click = same tab.
|
| NSEvent* me = cocoa_test_event_utils::MouseEventWithType(NSLeftMouseUp, 0);
|
| - EXPECT_EQ(CURRENT_TAB, WindowOpenDispositionFromNSEvent(me));
|
| + EXPECT_EQ(WindowOpenDisposition::CURRENT_TAB,
|
| + WindowOpenDispositionFromNSEvent(me));
|
|
|
| // Middle Click = new background tab.
|
| me = cocoa_test_event_utils::MouseEventWithType(NSOtherMouseUp, 0);
|
| - EXPECT_EQ(NEW_BACKGROUND_TAB, WindowOpenDispositionFromNSEvent(me));
|
| + EXPECT_EQ(WindowOpenDisposition::NEW_BACKGROUND_TAB,
|
| + WindowOpenDispositionFromNSEvent(me));
|
|
|
| // Shift+Middle Click = new foreground tab.
|
| {
|
| @@ -44,24 +46,27 @@ TEST_F(CocoaBaseUtilsTest, WindowOpenDispositionFromNSEvent) {
|
| [NSEvent class], [TestEvent class], @selector(modifierFlags));
|
| me = cocoa_test_event_utils::MouseEventWithType(NSOtherMouseUp,
|
| NSShiftKeyMask);
|
| - EXPECT_EQ(NEW_FOREGROUND_TAB, WindowOpenDispositionFromNSEvent(me));
|
| + EXPECT_EQ(WindowOpenDisposition::NEW_FOREGROUND_TAB,
|
| + WindowOpenDispositionFromNSEvent(me));
|
| }
|
|
|
| // Cmd+Left Click = new background tab.
|
| me = cocoa_test_event_utils::MouseEventWithType(NSLeftMouseUp,
|
| NSCommandKeyMask);
|
| - EXPECT_EQ(NEW_BACKGROUND_TAB, WindowOpenDispositionFromNSEvent(me));
|
| + EXPECT_EQ(WindowOpenDisposition::NEW_BACKGROUND_TAB,
|
| + WindowOpenDispositionFromNSEvent(me));
|
|
|
| // Cmd+Shift+Left Click = new foreground tab.
|
| - me = cocoa_test_event_utils::MouseEventWithType(NSLeftMouseUp,
|
| - NSCommandKeyMask |
|
| - NSShiftKeyMask);
|
| - EXPECT_EQ(NEW_FOREGROUND_TAB, WindowOpenDispositionFromNSEvent(me));
|
| + me = cocoa_test_event_utils::MouseEventWithType(
|
| + NSLeftMouseUp, NSCommandKeyMask | NSShiftKeyMask);
|
| + EXPECT_EQ(WindowOpenDisposition::NEW_FOREGROUND_TAB,
|
| + WindowOpenDispositionFromNSEvent(me));
|
|
|
| // Shift+Left Click = new window
|
| me = cocoa_test_event_utils::MouseEventWithType(NSLeftMouseUp,
|
| NSShiftKeyMask);
|
| - EXPECT_EQ(NEW_WINDOW, WindowOpenDispositionFromNSEvent(me));
|
| + EXPECT_EQ(WindowOpenDisposition::NEW_WINDOW,
|
| + WindowOpenDispositionFromNSEvent(me));
|
| }
|
|
|
| } // namespace
|
|
|