From f8d74230b839def072f26049845bd9003d87eb26 Mon Sep 17 00:00:00 2001 From: "dhollowa@chromium.org" Date: Tue, 20 Dec 2011 21:41:07 +0000 Subject: Rename ui::EventFlags mouse flags to be more sensible Changes EF_(LEFT|MIDDLE|RIGHT)_BUTTON_DOWN to EF_(LEF|MIDDLE|RIGHT)_MOUSE_BUTTON since these are not specific to "down" button events. This is follow up from review http://codereview.chromium.org/8953037 BUG=none TEST=Compiles. R=ben@chromium.org Review URL: http://codereview.chromium.org/9007016 git-svn-id: svn://svn.chromium.org/chrome/trunk/src@115188 0039d316-1c4b-4281-b951-d872f2087c98 --- ui/views/widget/widget_unittest.cc | 9 +++++---- 1 file changed, 5 insertions(+), 4 deletions(-) (limited to 'ui/views/widget') diff --git a/ui/views/widget/widget_unittest.cc b/ui/views/widget/widget_unittest.cc index 040a653..a765617 100644 --- a/ui/views/widget/widget_unittest.cc +++ b/ui/views/widget/widget_unittest.cc @@ -194,14 +194,14 @@ TEST_F(WidgetTest, DISABLED_GrabUngrab) { RunPendingMessages(); // Click on child1 - MouseEvent pressed(ui::ET_MOUSE_PRESSED, 45, 45, ui::EF_LEFT_BUTTON_DOWN); + MouseEvent pressed(ui::ET_MOUSE_PRESSED, 45, 45, ui::EF_LEFT_MOUSE_BUTTON); toplevel->OnMouseEvent(pressed); EXPECT_TRUE(WidgetHasMouseCapture(toplevel)); EXPECT_TRUE(WidgetHasMouseCapture(child1)); EXPECT_FALSE(WidgetHasMouseCapture(child2)); - MouseEvent released(ui::ET_MOUSE_RELEASED, 45, 45, ui::EF_LEFT_BUTTON_DOWN); + MouseEvent released(ui::ET_MOUSE_RELEASED, 45, 45, ui::EF_LEFT_MOUSE_BUTTON); toplevel->OnMouseEvent(released); EXPECT_FALSE(WidgetHasMouseCapture(toplevel)); @@ -211,13 +211,14 @@ TEST_F(WidgetTest, DISABLED_GrabUngrab) { RunPendingMessages(); // Click on child2 - MouseEvent pressed2(ui::ET_MOUSE_PRESSED, 315, 45, ui::EF_LEFT_BUTTON_DOWN); + MouseEvent pressed2(ui::ET_MOUSE_PRESSED, 315, 45, ui::EF_LEFT_MOUSE_BUTTON); EXPECT_TRUE(toplevel->OnMouseEvent(pressed2)); EXPECT_TRUE(WidgetHasMouseCapture(toplevel)); EXPECT_TRUE(WidgetHasMouseCapture(child2)); EXPECT_FALSE(WidgetHasMouseCapture(child1)); - MouseEvent released2(ui::ET_MOUSE_RELEASED, 315, 45, ui::EF_LEFT_BUTTON_DOWN); + MouseEvent released2(ui::ET_MOUSE_RELEASED, 315, 45, + ui::EF_LEFT_MOUSE_BUTTON); toplevel->OnMouseEvent(released2); EXPECT_FALSE(WidgetHasMouseCapture(toplevel)); EXPECT_FALSE(WidgetHasMouseCapture(child1)); -- cgit v1.1