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

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

Issue 10832282: Replace views::MouseEvent with ui::MouseEvent (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src/
Patch Set: Created 8 years, 4 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 | « 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
===================================================================
--- ui/views/widget/widget_unittest.cc (revision 151406)
+++ ui/views/widget/widget_unittest.cc (working copy)
@@ -75,7 +75,7 @@
}
virtual ~MouseView() {}
- virtual bool OnMousePressed(const MouseEvent& event) OVERRIDE {
+ virtual bool OnMousePressed(const ui::MouseEvent& event) OVERRIDE {
return true;
}
};
@@ -213,14 +213,17 @@
RunPendingMessages();
// Click on child1
- MouseEvent pressed(ui::ET_MOUSE_PRESSED, 45, 45, ui::EF_LEFT_MOUSE_BUTTON);
+ gfx::Point p1(45, 45);
+ ui::MouseEvent pressed(ui::ET_MOUSE_PRESSED, p1, p1,
+ 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_MOUSE_BUTTON);
+ ui::MouseEvent released(ui::ET_MOUSE_RELEASED, p1, p1,
+ ui::EF_LEFT_MOUSE_BUTTON);
toplevel->OnMouseEvent(released);
EXPECT_FALSE(WidgetHasMouseCapture(toplevel));
@@ -230,14 +233,16 @@
RunPendingMessages();
// Click on child2
- MouseEvent pressed2(ui::ET_MOUSE_PRESSED, 315, 45, ui::EF_LEFT_MOUSE_BUTTON);
+ gfx::Point p2(315, 45);
+ ui::MouseEvent pressed2(ui::ET_MOUSE_PRESSED, p2, p2,
+ 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_MOUSE_BUTTON);
+ ui::MouseEvent released2(ui::ET_MOUSE_RELEASED, p2, p2,
+ ui::EF_LEFT_MOUSE_BUTTON);
toplevel->OnMouseEvent(released2);
EXPECT_FALSE(WidgetHasMouseCapture(toplevel));
EXPECT_FALSE(WidgetHasMouseCapture(child1));
« 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