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

Unified Diff: chrome/browser/ui/cocoa/tabs/tab_strip_controller_unittest.mm

Issue 1946993004: [Mac][Material Design] Fix TabStripController test that fails under MD. (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: Fix variable name. 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 | « chrome/browser/ui/cocoa/tabs/tab_strip_controller.mm ('k') | no next file » | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: chrome/browser/ui/cocoa/tabs/tab_strip_controller_unittest.mm
diff --git a/chrome/browser/ui/cocoa/tabs/tab_strip_controller_unittest.mm b/chrome/browser/ui/cocoa/tabs/tab_strip_controller_unittest.mm
index 057ebd516a0119ef236ec89fb49b0050e76353cf..e841a635a54075d16ff9674008c6170ae1aa2d0e 100644
--- a/chrome/browser/ui/cocoa/tabs/tab_strip_controller_unittest.mm
+++ b/chrome/browser/ui/cocoa/tabs/tab_strip_controller_unittest.mm
@@ -250,23 +250,31 @@ TEST_F(TabStripControllerTest, CorrectMouseHoverBehavior) {
// Set up mouse event on overlap of tab1 + tab2.
const CGFloat min_y = NSMinY([tab_strip_.get() frame]) + 1;
+ const CGFloat tab_overlap = [TabStripController tabOverlap];
// Hover over overlap between tab 1 and 2.
- NSEvent* event =
- cocoa_test_event_utils::MouseEventAtPoint(NSMakePoint(280, min_y),
- NSMouseMoved, 0);
+ NSRect tab1_frame = [tab1 frame];
+ NSPoint tab_overlap_point =
+ NSMakePoint(NSMaxX(tab1_frame) - tab_overlap / 2, min_y);
+
+ NSEvent* event = cocoa_test_event_utils::MouseEventAtPoint(tab_overlap_point,
+ NSMouseMoved,
+ 0);
[controller_.get() mouseMoved:event];
EXPECT_EQ(tab2, [controller_ hoveredTab]);
// Hover over tab 1.
- event = cocoa_test_event_utils::MouseEventAtPoint(NSMakePoint(260, min_y),
- NSMouseMoved, 0);
+ NSPoint hover_point = NSMakePoint(NSMidX(tab1_frame), min_y);
+ event =
+ cocoa_test_event_utils::MouseEventAtPoint(hover_point, NSMouseMoved, 0);
[controller_.get() mouseMoved:event];
EXPECT_EQ(tab1, [controller_ hoveredTab]);
// Hover over tab 2.
- event = cocoa_test_event_utils::MouseEventAtPoint(NSMakePoint(290, min_y),
- NSMouseMoved, 0);
+ NSRect tab2_frame = [tab2 frame];
+ hover_point = NSMakePoint(NSMidX(tab2_frame), min_y);
+ event =
+ cocoa_test_event_utils::MouseEventAtPoint(hover_point, NSMouseMoved, 0);
[controller_.get() mouseMoved:event];
EXPECT_EQ(tab2, [controller_ hoveredTab]);
}
« no previous file with comments | « chrome/browser/ui/cocoa/tabs/tab_strip_controller.mm ('k') | no next file » | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698