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

Unified Diff: ui/views/widget/widget_unittest.cc

Issue 11592011: events: Update mouse-event handlers to not return EventResult. (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: Created 8 years 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 | « ui/views/widget/widget.cc ('k') | no next file » | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: ui/views/widget/widget_unittest.cc
diff --git a/ui/views/widget/widget_unittest.cc b/ui/views/widget/widget_unittest.cc
index 5a001b8c69170633375d909544da7b8bb8247439..120e39f6fc56f9f62a2edb8901b69fc4e28731e5 100644
--- a/ui/views/widget/widget_unittest.cc
+++ b/ui/views/widget/widget_unittest.cc
@@ -284,7 +284,7 @@ TEST_F(WidgetTest, DISABLED_GrabUngrab) {
gfx::Point p1(45, 45);
ui::MouseEvent pressed(ui::ET_MOUSE_PRESSED, p1, p1,
ui::EF_LEFT_MOUSE_BUTTON);
- toplevel->OnMouseEvent(pressed);
+ toplevel->OnMouseEvent(&pressed);
EXPECT_TRUE(WidgetHasMouseCapture(toplevel));
EXPECT_TRUE(WidgetHasMouseCapture(child1));
@@ -292,7 +292,7 @@ TEST_F(WidgetTest, DISABLED_GrabUngrab) {
ui::MouseEvent released(ui::ET_MOUSE_RELEASED, p1, p1,
ui::EF_LEFT_MOUSE_BUTTON);
- toplevel->OnMouseEvent(released);
+ toplevel->OnMouseEvent(&released);
EXPECT_FALSE(WidgetHasMouseCapture(toplevel));
EXPECT_FALSE(WidgetHasMouseCapture(child1));
@@ -304,14 +304,15 @@ TEST_F(WidgetTest, DISABLED_GrabUngrab) {
gfx::Point p2(315, 45);
ui::MouseEvent pressed2(ui::ET_MOUSE_PRESSED, p2, p2,
ui::EF_LEFT_MOUSE_BUTTON);
- EXPECT_TRUE(toplevel->OnMouseEvent(pressed2));
+ toplevel->OnMouseEvent(&pressed2);
+ EXPECT_TRUE(pressed2.handled());
EXPECT_TRUE(WidgetHasMouseCapture(toplevel));
EXPECT_TRUE(WidgetHasMouseCapture(child2));
EXPECT_FALSE(WidgetHasMouseCapture(child1));
ui::MouseEvent released2(ui::ET_MOUSE_RELEASED, p2, p2,
ui::EF_LEFT_MOUSE_BUTTON);
- toplevel->OnMouseEvent(released2);
+ toplevel->OnMouseEvent(&released2);
EXPECT_FALSE(WidgetHasMouseCapture(toplevel));
EXPECT_FALSE(WidgetHasMouseCapture(child1));
EXPECT_FALSE(WidgetHasMouseCapture(child2));
@@ -336,26 +337,26 @@ TEST_F(WidgetTest, CheckResizeControllerEvents) {
// Move to an outside position.
gfx::Point p1(200, 200);
ui::MouseEvent moved_out(ui::ET_MOUSE_MOVED, p1, p1, ui::EF_NONE);
- toplevel->OnMouseEvent(moved_out);
+ toplevel->OnMouseEvent(&moved_out);
EXPECT_EQ(0, view->EnteredCalls());
EXPECT_EQ(0, view->ExitedCalls());
// Move onto the active view.
gfx::Point p2(95, 95);
ui::MouseEvent moved_over(ui::ET_MOUSE_MOVED, p2, p2, ui::EF_NONE);
- toplevel->OnMouseEvent(moved_over);
+ toplevel->OnMouseEvent(&moved_over);
EXPECT_EQ(1, view->EnteredCalls());
EXPECT_EQ(0, view->ExitedCalls());
// Move onto the outer resizing border.
gfx::Point p3(102, 95);
ui::MouseEvent moved_resizer(ui::ET_MOUSE_MOVED, p3, p3, ui::EF_NONE);
- toplevel->OnMouseEvent(moved_resizer);
+ toplevel->OnMouseEvent(&moved_resizer);
EXPECT_EQ(0, view->EnteredCalls());
EXPECT_EQ(1, view->ExitedCalls());
// Move onto the view again.
- toplevel->OnMouseEvent(moved_over);
+ toplevel->OnMouseEvent(&moved_over);
EXPECT_EQ(1, view->EnteredCalls());
EXPECT_EQ(0, view->ExitedCalls());
@@ -997,15 +998,15 @@ TEST_F(WidgetTest, ResetCaptureOnGestureEnd) {
ui::MouseEvent release(ui::ET_MOUSE_RELEASED, click_location, click_location,
ui::EF_LEFT_MOUSE_BUTTON);
- toplevel->OnMouseEvent(press);
- toplevel->OnMouseEvent(release);
+ toplevel->OnMouseEvent(&press);
+ toplevel->OnMouseEvent(&release);
EXPECT_EQ(0, mouse->pressed());
// The end of the gesture should release the capture, and pressing on |mouse|
// should now reach |mouse|.
toplevel->OnGestureEvent(&end);
- toplevel->OnMouseEvent(press);
- toplevel->OnMouseEvent(release);
+ toplevel->OnMouseEvent(&press);
+ toplevel->OnMouseEvent(&release);
EXPECT_EQ(1, mouse->pressed());
toplevel->Close();
« no previous file with comments | « ui/views/widget/widget.cc ('k') | no next file » | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698