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/view_unittest.cc | |
| 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/view_unittest.cc')
| -rw-r--r-- | ui/views/view_unittest.cc | 16 |
1 files changed, 8 insertions, 8 deletions
diff --git a/ui/views/view_unittest.cc b/ui/views/view_unittest.cc index db3664c..8d68d2c 100644 --- a/ui/views/view_unittest.cc +++ b/ui/views/view_unittest.cc @@ -344,7 +344,7 @@ TEST_F(ViewTest, MouseEvent) { MouseEvent pressed(ui::ET_MOUSE_PRESSED, 110, 120, - ui::EF_LEFT_BUTTON_DOWN); + ui::EF_LEFT_MOUSE_BUTTON); root->OnMousePressed(pressed); EXPECT_EQ(v2->last_mouse_event_type_, ui::ET_MOUSE_PRESSED); EXPECT_EQ(v2->location_.x(), 10); @@ -358,7 +358,7 @@ TEST_F(ViewTest, MouseEvent) { MouseEvent dragged(ui::ET_MOUSE_DRAGGED, 50, 40, - ui::EF_LEFT_BUTTON_DOWN); + ui::EF_LEFT_MOUSE_BUTTON); root->OnMouseDragged(dragged); EXPECT_EQ(v2->last_mouse_event_type_, ui::ET_MOUSE_DRAGGED); EXPECT_EQ(v2->location_.x(), -50); @@ -1485,9 +1485,9 @@ class ButtonDropDownTest : public ViewTest { // Ensure that regular clicks on the drop down button still work. (i.e. - the // click events are processed and the listener gets the click) TEST_F(ButtonDropDownTest, RegularClickTest) { - MouseEvent press_event(ui::ET_MOUSE_PRESSED, 1, 1, ui::EF_LEFT_BUTTON_DOWN); + MouseEvent press_event(ui::ET_MOUSE_PRESSED, 1, 1, ui::EF_LEFT_MOUSE_BUTTON); MouseEvent release_event(ui::ET_MOUSE_RELEASED, 1, 1, - ui::EF_LEFT_BUTTON_DOWN); + ui::EF_LEFT_MOUSE_BUTTON); button_as_view_->OnMousePressed(press_event); button_as_view_->OnMouseReleased(release_event); EXPECT_EQ(test_dialog_->last_pressed_button_, test_dialog_->button_drop_); @@ -1745,7 +1745,7 @@ TEST_F(ViewTest, TransformEvent) { MouseEvent pressed(ui::ET_MOUSE_PRESSED, 110, 210, - ui::EF_LEFT_BUTTON_DOWN); + ui::EF_LEFT_MOUSE_BUTTON); root->OnMousePressed(pressed); EXPECT_EQ(0, v1->last_mouse_event_type_); EXPECT_EQ(ui::ET_MOUSE_PRESSED, v2->last_mouse_event_type_); @@ -1769,7 +1769,7 @@ TEST_F(ViewTest, TransformEvent) { MouseEvent p2(ui::ET_MOUSE_PRESSED, 110, 320, - ui::EF_LEFT_BUTTON_DOWN); + ui::EF_LEFT_MOUSE_BUTTON); root->OnMousePressed(p2); EXPECT_EQ(0, v1->last_mouse_event_type_); EXPECT_EQ(ui::ET_MOUSE_PRESSED, v2->last_mouse_event_type_); @@ -1804,7 +1804,7 @@ TEST_F(ViewTest, TransformEvent) { MouseEvent p3(ui::ET_MOUSE_PRESSED, 112, 110, - ui::EF_LEFT_BUTTON_DOWN); + ui::EF_LEFT_MOUSE_BUTTON); root->OnMousePressed(p3); EXPECT_EQ(ui::ET_MOUSE_PRESSED, v3->last_mouse_event_type_); @@ -1840,7 +1840,7 @@ TEST_F(ViewTest, TransformEvent) { MouseEvent p4(ui::ET_MOUSE_PRESSED, 124, 125, - ui::EF_LEFT_BUTTON_DOWN); + ui::EF_LEFT_MOUSE_BUTTON); root->OnMousePressed(p4); EXPECT_EQ(ui::ET_MOUSE_PRESSED, v3->last_mouse_event_type_); |