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

Issues Search
    My Issues | Starred     Open | Closed | All

Unified Diff: ash/shelf/shelf_view_unittest.cc

Issue 2786693002: Add PointerDetails to ui::MouseEvent's constructors (Closed)
Patch Set: mouse event constructor Created 3 years, 9 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 | « ash/root_window_controller.cc ('k') | ash/shelf/shelf_widget_unittest.cc » ('j') | ui/events/event.h » ('J')
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: ash/shelf/shelf_view_unittest.cc
diff --git a/ash/shelf/shelf_view_unittest.cc b/ash/shelf/shelf_view_unittest.cc
index 43a92bea720e3e658d808b7fa54ec5a7ba653879..8378c8c4977134709eb11b2bd09c09053a61a87b 100644
--- a/ash/shelf/shelf_view_unittest.cc
+++ b/ash/shelf/shelf_view_unittest.cc
@@ -445,9 +445,10 @@ class ShelfViewTest : public AshTestBase {
// Simulate a mouse press event on the shelf's view at |view_index|.
views::View* SimulateViewPressed(ShelfView::Pointer pointer, int view_index) {
views::View* view = test_api_->GetViewAt(view_index);
- ui::MouseEvent pressed_event(ui::ET_MOUSE_PRESSED, gfx::Point(),
- view->GetBoundsInScreen().origin(),
- ui::EventTimeForNow(), 0, 0);
+ ui::MouseEvent pressed_event(
+ ui::ET_MOUSE_PRESSED, gfx::Point(), view->GetBoundsInScreen().origin(),
+ ui::EventTimeForNow(), 0, 0,
+ ui::PointerDetails(ui::EventPointerType::POINTER_TYPE_MOUSE));
shelf_view_->PointerPressedOnButton(view, pointer, pressed_event);
return view;
}
@@ -465,9 +466,10 @@ class ShelfViewTest : public AshTestBase {
// Simulates a single mouse click.
void SimulateClick(int button_index) {
ShelfButton* button = SimulateButtonPressed(ShelfView::MOUSE, button_index);
- ui::MouseEvent release_event(ui::ET_MOUSE_RELEASED, gfx::Point(),
- button->GetBoundsInScreen().origin(),
- ui::EventTimeForNow(), 0, 0);
+ ui::MouseEvent release_event(
+ ui::ET_MOUSE_RELEASED, gfx::Point(),
+ button->GetBoundsInScreen().origin(), ui::EventTimeForNow(), 0, 0,
+ ui::PointerDetails(ui::EventPointerType::POINTER_TYPE_MOUSE));
test_api_->ButtonPressed(
button, release_event,
views::test::InkDropHostViewTestApi(button).GetInkDrop());
@@ -477,10 +479,11 @@ class ShelfViewTest : public AshTestBase {
// Simulates the second click of a double click.
void SimulateDoubleClick(int button_index) {
ShelfButton* button = SimulateButtonPressed(ShelfView::MOUSE, button_index);
- ui::MouseEvent release_event(ui::ET_MOUSE_RELEASED, gfx::Point(),
- button->GetBoundsInScreen().origin(),
- ui::EventTimeForNow(), ui::EF_IS_DOUBLE_CLICK,
- 0);
+ ui::MouseEvent release_event(
+ ui::ET_MOUSE_RELEASED, gfx::Point(),
+ button->GetBoundsInScreen().origin(), ui::EventTimeForNow(),
+ ui::EF_IS_DOUBLE_CLICK, 0,
+ ui::PointerDetails(ui::EventPointerType::POINTER_TYPE_MOUSE));
test_api_->ButtonPressed(
button, release_event,
views::test::InkDropHostViewTestApi(button).GetInkDrop());
@@ -492,9 +495,10 @@ class ShelfViewTest : public AshTestBase {
views::View* button,
ShelfView::Pointer pointer,
views::View* to) {
- ui::MouseEvent drag_event(ui::ET_MOUSE_DRAGGED, gfx::Point(dist_x, dist_y),
- to->GetBoundsInScreen().origin(),
- ui::EventTimeForNow(), 0, 0);
+ ui::MouseEvent drag_event(
+ ui::ET_MOUSE_DRAGGED, gfx::Point(dist_x, dist_y),
+ to->GetBoundsInScreen().origin(), ui::EventTimeForNow(), 0, 0,
+ ui::PointerDetails(ui::EventPointerType::POINTER_TYPE_MOUSE));
shelf_view_->PointerDraggedOnButton(button, pointer, drag_event);
}
@@ -1256,27 +1260,31 @@ TEST_F(ShelfViewTest, ClickAndMoveSlightly) {
gfx::Point press_location_in_screen =
button->GetBoundsInScreen().origin() + press_offset;
- ui::MouseEvent click_event(ui::ET_MOUSE_PRESSED, press_location,
- press_location_in_screen, ui::EventTimeForNow(),
- ui::EF_LEFT_MOUSE_BUTTON, 0);
+ ui::MouseEvent click_event(
+ ui::ET_MOUSE_PRESSED, press_location, press_location_in_screen,
+ ui::EventTimeForNow(), ui::EF_LEFT_MOUSE_BUTTON, 0,
+ ui::PointerDetails(ui::EventPointerType::POINTER_TYPE_MOUSE));
button->OnMousePressed(click_event);
ui::MouseEvent drag_event1(
ui::ET_MOUSE_DRAGGED, press_location + gfx::Vector2d(0, 1),
press_location_in_screen + gfx::Vector2d(0, 1), ui::EventTimeForNow(),
- ui::EF_LEFT_MOUSE_BUTTON, 0);
+ ui::EF_LEFT_MOUSE_BUTTON, 0,
+ ui::PointerDetails(ui::EventPointerType::POINTER_TYPE_MOUSE));
button->OnMouseDragged(drag_event1);
ui::MouseEvent drag_event2(
ui::ET_MOUSE_DRAGGED, press_location + gfx::Vector2d(-1, 0),
press_location_in_screen + gfx::Vector2d(-1, 0), ui::EventTimeForNow(),
- ui::EF_LEFT_MOUSE_BUTTON, 0);
+ ui::EF_LEFT_MOUSE_BUTTON, 0,
+ ui::PointerDetails(ui::EventPointerType::POINTER_TYPE_MOUSE));
button->OnMouseDragged(drag_event2);
ui::MouseEvent release_event(
ui::ET_MOUSE_RELEASED, press_location + gfx::Vector2d(-1, 0),
press_location_in_screen + gfx::Vector2d(-1, 0), ui::EventTimeForNow(),
- ui::EF_LEFT_MOUSE_BUTTON, 0);
+ ui::EF_LEFT_MOUSE_BUTTON, 0,
+ ui::PointerDetails(ui::EventPointerType::POINTER_TYPE_MOUSE));
button->OnMouseReleased(release_event);
EXPECT_TRUE(selection_tracker->WasSelected());
@@ -2294,18 +2302,20 @@ TEST_F(ShelfViewInkDropTest, ShelfButtonWithoutMenuPressRelease) {
views::CustomButton* button = browser_button_;
gfx::Point mouse_location = button->GetLocalBounds().CenterPoint();
- ui::MouseEvent press_event(ui::ET_MOUSE_PRESSED, mouse_location,
- mouse_location, ui::EventTimeForNow(),
- ui::EF_LEFT_MOUSE_BUTTON, 0);
+ ui::MouseEvent press_event(
+ ui::ET_MOUSE_PRESSED, mouse_location, mouse_location,
+ ui::EventTimeForNow(), ui::EF_LEFT_MOUSE_BUTTON, 0,
+ ui::PointerDetails(ui::EventPointerType::POINTER_TYPE_MOUSE));
button->OnMousePressed(press_event);
EXPECT_EQ(views::InkDropState::ACTION_PENDING,
browser_button_ink_drop_->GetTargetInkDropState());
EXPECT_THAT(browser_button_ink_drop_->GetAndResetRequestedStates(),
ElementsAre(views::InkDropState::ACTION_PENDING));
- ui::MouseEvent release_event(ui::ET_MOUSE_RELEASED, mouse_location,
- mouse_location, ui::EventTimeForNow(),
- ui::EF_LEFT_MOUSE_BUTTON, 0);
+ ui::MouseEvent release_event(
+ ui::ET_MOUSE_RELEASED, mouse_location, mouse_location,
+ ui::EventTimeForNow(), ui::EF_LEFT_MOUSE_BUTTON, 0,
+ ui::PointerDetails(ui::EventPointerType::POINTER_TYPE_MOUSE));
button->OnMouseReleased(release_event);
EXPECT_EQ(views::InkDropState::HIDDEN,
browser_button_ink_drop_->GetTargetInkDropState());
@@ -2321,9 +2331,10 @@ TEST_F(ShelfViewInkDropTest, ShelfButtonWithoutMenuPressDragReleaseOutside) {
views::CustomButton* button = browser_button_;
gfx::Point mouse_location = button->GetLocalBounds().CenterPoint();
- ui::MouseEvent press_event(ui::ET_MOUSE_PRESSED, mouse_location,
- mouse_location, ui::EventTimeForNow(),
- ui::EF_LEFT_MOUSE_BUTTON, 0);
+ ui::MouseEvent press_event(
+ ui::ET_MOUSE_PRESSED, mouse_location, mouse_location,
+ ui::EventTimeForNow(), ui::EF_LEFT_MOUSE_BUTTON, 0,
+ ui::PointerDetails(ui::EventPointerType::POINTER_TYPE_MOUSE));
button->OnMousePressed(press_event);
EXPECT_EQ(views::InkDropState::ACTION_PENDING,
browser_button_ink_drop_->GetTargetInkDropState());
@@ -2331,9 +2342,10 @@ TEST_F(ShelfViewInkDropTest, ShelfButtonWithoutMenuPressDragReleaseOutside) {
ElementsAre(views::InkDropState::ACTION_PENDING));
mouse_location.Offset(test_api_->GetMinimumDragDistance() / 2, 0);
- ui::MouseEvent drag_event_small(ui::ET_MOUSE_DRAGGED, mouse_location,
- mouse_location, ui::EventTimeForNow(),
- ui::EF_LEFT_MOUSE_BUTTON, 0);
+ ui::MouseEvent drag_event_small(
+ ui::ET_MOUSE_DRAGGED, mouse_location, mouse_location,
+ ui::EventTimeForNow(), ui::EF_LEFT_MOUSE_BUTTON, 0,
+ ui::PointerDetails(ui::EventPointerType::POINTER_TYPE_MOUSE));
button->OnMouseDragged(drag_event_small);
EXPECT_EQ(views::InkDropState::ACTION_PENDING,
browser_button_ink_drop_->GetTargetInkDropState());
@@ -2341,18 +2353,20 @@ TEST_F(ShelfViewInkDropTest, ShelfButtonWithoutMenuPressDragReleaseOutside) {
IsEmpty());
mouse_location.Offset(test_api_->GetMinimumDragDistance(), 0);
- ui::MouseEvent drag_event_large(ui::ET_MOUSE_DRAGGED, mouse_location,
- mouse_location, ui::EventTimeForNow(),
- ui::EF_LEFT_MOUSE_BUTTON, 0);
+ ui::MouseEvent drag_event_large(
+ ui::ET_MOUSE_DRAGGED, mouse_location, mouse_location,
+ ui::EventTimeForNow(), ui::EF_LEFT_MOUSE_BUTTON, 0,
+ ui::PointerDetails(ui::EventPointerType::POINTER_TYPE_MOUSE));
button->OnMouseDragged(drag_event_large);
EXPECT_EQ(views::InkDropState::HIDDEN,
browser_button_ink_drop_->GetTargetInkDropState());
EXPECT_THAT(browser_button_ink_drop_->GetAndResetRequestedStates(),
ElementsAre(views::InkDropState::HIDDEN));
- ui::MouseEvent release_event(ui::ET_MOUSE_RELEASED, mouse_location,
- mouse_location, ui::EventTimeForNow(),
- ui::EF_LEFT_MOUSE_BUTTON, 0);
+ ui::MouseEvent release_event(
+ ui::ET_MOUSE_RELEASED, mouse_location, mouse_location,
+ ui::EventTimeForNow(), ui::EF_LEFT_MOUSE_BUTTON, 0,
+ ui::PointerDetails(ui::EventPointerType::POINTER_TYPE_MOUSE));
button->OnMouseReleased(release_event);
EXPECT_EQ(views::InkDropState::HIDDEN,
browser_button_ink_drop_->GetTargetInkDropState());
@@ -2368,9 +2382,10 @@ TEST_F(ShelfViewInkDropTest, ShelfButtonWithoutMenuPressDragReleaseInside) {
views::CustomButton* button = browser_button_;
gfx::Point mouse_location = button->GetLocalBounds().CenterPoint();
- ui::MouseEvent press_event(ui::ET_MOUSE_PRESSED, mouse_location,
- mouse_location, ui::EventTimeForNow(),
- ui::EF_LEFT_MOUSE_BUTTON, 0);
+ ui::MouseEvent press_event(
+ ui::ET_MOUSE_PRESSED, mouse_location, mouse_location,
+ ui::EventTimeForNow(), ui::EF_LEFT_MOUSE_BUTTON, 0,
+ ui::PointerDetails(ui::EventPointerType::POINTER_TYPE_MOUSE));
button->OnMousePressed(press_event);
EXPECT_EQ(views::InkDropState::ACTION_PENDING,
browser_button_ink_drop_->GetTargetInkDropState());
@@ -2378,9 +2393,10 @@ TEST_F(ShelfViewInkDropTest, ShelfButtonWithoutMenuPressDragReleaseInside) {
ElementsAre(views::InkDropState::ACTION_PENDING));
mouse_location.Offset(test_api_->GetMinimumDragDistance() * 2, 0);
- ui::MouseEvent drag_event_outside(ui::ET_MOUSE_DRAGGED, mouse_location,
- mouse_location, ui::EventTimeForNow(),
- ui::EF_LEFT_MOUSE_BUTTON, 0);
+ ui::MouseEvent drag_event_outside(
+ ui::ET_MOUSE_DRAGGED, mouse_location, mouse_location,
+ ui::EventTimeForNow(), ui::EF_LEFT_MOUSE_BUTTON, 0,
+ ui::PointerDetails(ui::EventPointerType::POINTER_TYPE_MOUSE));
button->OnMouseDragged(drag_event_outside);
EXPECT_EQ(views::InkDropState::HIDDEN,
browser_button_ink_drop_->GetTargetInkDropState());
@@ -2388,18 +2404,20 @@ TEST_F(ShelfViewInkDropTest, ShelfButtonWithoutMenuPressDragReleaseInside) {
ElementsAre(views::InkDropState::HIDDEN));
mouse_location.Offset(-test_api_->GetMinimumDragDistance() * 2, 0);
- ui::MouseEvent drag_event_inside(ui::ET_MOUSE_DRAGGED, mouse_location,
- mouse_location, ui::EventTimeForNow(),
- ui::EF_LEFT_MOUSE_BUTTON, 0);
+ ui::MouseEvent drag_event_inside(
+ ui::ET_MOUSE_DRAGGED, mouse_location, mouse_location,
+ ui::EventTimeForNow(), ui::EF_LEFT_MOUSE_BUTTON, 0,
+ ui::PointerDetails(ui::EventPointerType::POINTER_TYPE_MOUSE));
button->OnMouseDragged(drag_event_inside);
EXPECT_EQ(views::InkDropState::HIDDEN,
browser_button_ink_drop_->GetTargetInkDropState());
EXPECT_THAT(browser_button_ink_drop_->GetAndResetRequestedStates(),
IsEmpty());
- ui::MouseEvent release_event(ui::ET_MOUSE_RELEASED, mouse_location,
- mouse_location, ui::EventTimeForNow(),
- ui::EF_LEFT_MOUSE_BUTTON, 0);
+ ui::MouseEvent release_event(
+ ui::ET_MOUSE_RELEASED, mouse_location, mouse_location,
+ ui::EventTimeForNow(), ui::EF_LEFT_MOUSE_BUTTON, 0,
+ ui::PointerDetails(ui::EventPointerType::POINTER_TYPE_MOUSE));
button->OnMouseReleased(release_event);
EXPECT_EQ(views::InkDropState::HIDDEN,
browser_button_ink_drop_->GetTargetInkDropState());
@@ -2420,9 +2438,10 @@ TEST_F(ShelfViewInkDropTest, ShelfButtonWithMenuPressRelease) {
views::CustomButton* button = browser_button_;
gfx::Point mouse_location = button->GetLocalBounds().CenterPoint();
- ui::MouseEvent press_event(ui::ET_MOUSE_PRESSED, mouse_location,
- mouse_location, ui::EventTimeForNow(),
- ui::EF_LEFT_MOUSE_BUTTON, 0);
+ ui::MouseEvent press_event(
+ ui::ET_MOUSE_PRESSED, mouse_location, mouse_location,
+ ui::EventTimeForNow(), ui::EF_LEFT_MOUSE_BUTTON, 0,
+ ui::PointerDetails(ui::EventPointerType::POINTER_TYPE_MOUSE));
button->OnMousePressed(press_event);
EXPECT_EQ(views::InkDropState::ACTION_PENDING,
browser_button_ink_drop_->GetTargetInkDropState());
@@ -2430,9 +2449,10 @@ TEST_F(ShelfViewInkDropTest, ShelfButtonWithMenuPressRelease) {
ElementsAre(views::InkDropState::ACTION_PENDING));
// Mouse release will spawn a menu which we will then close.
- ui::MouseEvent release_event(ui::ET_MOUSE_RELEASED, mouse_location,
- mouse_location, ui::EventTimeForNow(),
- ui::EF_LEFT_MOUSE_BUTTON, 0);
+ ui::MouseEvent release_event(
+ ui::ET_MOUSE_RELEASED, mouse_location, mouse_location,
+ ui::EventTimeForNow(), ui::EF_LEFT_MOUSE_BUTTON, 0,
+ ui::PointerDetails(ui::EventPointerType::POINTER_TYPE_MOUSE));
button->OnMouseReleased(release_event);
test_api_->CloseMenu();
EXPECT_EQ(views::InkDropState::HIDDEN,
« no previous file with comments | « ash/root_window_controller.cc ('k') | ash/shelf/shelf_widget_unittest.cc » ('j') | ui/events/event.h » ('J')

Powered by Google App Engine
This is Rietveld 408576698