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

Unified Diff: ui/base/cocoa/cocoa_base_utils_unittest.mm

Issue 2248873002: Convert WindowOpenDisposition to an enum class. (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: Rebase. Created 4 years, 4 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 | « services/navigation/view_impl.cc ('k') | ui/base/window_open_disposition.h » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
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
« no previous file with comments | « services/navigation/view_impl.cc ('k') | ui/base/window_open_disposition.h » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698