| Index: ui/views/controls/table/table_view_unittest.cc
|
| diff --git a/ui/views/controls/table/table_view_unittest.cc b/ui/views/controls/table/table_view_unittest.cc
|
| index 4d89f3272b337c9ead0f13f32d163e8c8c863275..70547ce900c19bdcb9d450bb2343dadb2f8e34e4 100644
|
| --- a/ui/views/controls/table/table_view_unittest.cc
|
| +++ b/ui/views/controls/table/table_view_unittest.cc
|
| @@ -191,7 +191,8 @@ class TableViewTest : public testing::Test {
|
| const int y = row * table_->row_height();
|
| const ui::MouseEvent pressed(ui::ET_MOUSE_PRESSED, gfx::Point(0, y),
|
| gfx::Point(0, y),
|
| - ui::EF_LEFT_MOUSE_BUTTON | flags);
|
| + ui::EF_LEFT_MOUSE_BUTTON | flags,
|
| + ui::EF_LEFT_MOUSE_BUTTON);
|
| table_->OnMousePressed(pressed);
|
| }
|
|
|
| @@ -289,10 +290,12 @@ TEST_F(TableViewTest, Resize) {
|
| EXPECT_NE(0, x);
|
| // Drag the mouse 1 pixel to the left.
|
| const ui::MouseEvent pressed(ui::ET_MOUSE_PRESSED, gfx::Point(x, 0),
|
| - gfx::Point(x, 0), ui::EF_LEFT_MOUSE_BUTTON);
|
| + gfx::Point(x, 0), ui::EF_LEFT_MOUSE_BUTTON,
|
| + ui::EF_LEFT_MOUSE_BUTTON);
|
| helper_->header()->OnMousePressed(pressed);
|
| const ui::MouseEvent dragged(ui::ET_MOUSE_DRAGGED, gfx::Point(x - 1, 0),
|
| - gfx::Point(x - 1, 0), ui::EF_LEFT_MOUSE_BUTTON);
|
| + gfx::Point(x - 1, 0), ui::EF_LEFT_MOUSE_BUTTON,
|
| + 0);
|
| helper_->header()->OnMouseDragged(dragged);
|
|
|
| // This should shrink the first column and pull the second column in.
|
| @@ -378,11 +381,13 @@ TEST_F(TableViewTest, SortOnMouse) {
|
| EXPECT_NE(0, x);
|
| // Press and release the mouse.
|
| const ui::MouseEvent pressed(ui::ET_MOUSE_PRESSED, gfx::Point(x, 0),
|
| - gfx::Point(x, 0), ui::EF_LEFT_MOUSE_BUTTON);
|
| + gfx::Point(x, 0), ui::EF_LEFT_MOUSE_BUTTON,
|
| + ui::EF_LEFT_MOUSE_BUTTON);
|
| // The header must return true, else it won't normally get the release.
|
| EXPECT_TRUE(helper_->header()->OnMousePressed(pressed));
|
| const ui::MouseEvent release(ui::ET_MOUSE_RELEASED, gfx::Point(x, 0),
|
| - gfx::Point(x, 0), ui::EF_LEFT_MOUSE_BUTTON);
|
| + gfx::Point(x, 0), ui::EF_LEFT_MOUSE_BUTTON,
|
| + ui::EF_LEFT_MOUSE_BUTTON);
|
| helper_->header()->OnMouseReleased(release);
|
|
|
| ASSERT_EQ(1u, table_->sort_descriptors().size());
|
|
|