diff options
| author | dhollowa@chromium.org <dhollowa@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2011-12-20 21:41:07 +0000 |
|---|---|---|
| committer | dhollowa@chromium.org <dhollowa@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2011-12-20 21:41:07 +0000 |
| commit | f8d74230b839def072f26049845bd9003d87eb26 (patch) | |
| tree | 7d5ecb668377162dab0260e7fe107018115b904e /ui/views/widget | |
| parent | 2212d27f2cc41983901f45299cda82d704c76e82 (diff) | |
| download | chromium_src-f8d74230b839def072f26049845bd9003d87eb26.zip chromium_src-f8d74230b839def072f26049845bd9003d87eb26.tar.gz chromium_src-f8d74230b839def072f26049845bd9003d87eb26.tar.bz2 | |
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
Diffstat (limited to 'ui/views/widget')
| -rw-r--r-- | ui/views/widget/widget_unittest.cc | 9 |
1 files changed, 5 insertions, 4 deletions
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)); |