summaryrefslogtreecommitdiffstats
path: root/ui/aura/root_window_unittest.cc
diff options
context:
space:
mode:
authordavemoore@chromium.org <davemoore@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98>2013-02-12 18:14:59 +0000
committerdavemoore@chromium.org <davemoore@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98>2013-02-12 18:14:59 +0000
commit8aee03e0ed72dd62e56d18a6437c3db334a4e944 (patch)
tree50cb3252ccbcd0d99a8489d57bde19074c354c75 /ui/aura/root_window_unittest.cc
parent65b3f127186adb64df1996a52673d02ed2aebad1 (diff)
downloadchromium_src-8aee03e0ed72dd62e56d18a6437c3db334a4e944.zip
chromium_src-8aee03e0ed72dd62e56d18a6437c3db334a4e944.tar.gz
chromium_src-8aee03e0ed72dd62e56d18a6437c3db334a4e944.tar.bz2
Add support for ordinal scroll amounts
BUG=175604 TEST=None Review URL: https://codereview.chromium.org/12208118 git-svn-id: svn://svn.chromium.org/chrome/trunk/src@181951 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'ui/aura/root_window_unittest.cc')
-rw-r--r--ui/aura/root_window_unittest.cc16
1 files changed, 14 insertions, 2 deletions
diff --git a/ui/aura/root_window_unittest.cc b/ui/aura/root_window_unittest.cc
index 8a5f26f..cc2a857 100644
--- a/ui/aura/root_window_unittest.cc
+++ b/ui/aura/root_window_unittest.cc
@@ -380,12 +380,24 @@ TEST_F(RootWindowTest, ScrollEventDispatch) {
w1->SetBounds(gfx::Rect(20, 20, 40, 40));
// A scroll event on the root-window itself is dispatched.
- ui::ScrollEvent scroll1(ui::ET_SCROLL, gfx::Point(10, 10), now, 0, 0, -10, 2);
+ ui::ScrollEvent scroll1(ui::ET_SCROLL,
+ gfx::Point(10, 10),
+ now,
+ 0,
+ 0, -10,
+ 0, -10,
+ 2);
root_window()->AsRootWindowHostDelegate()->OnHostScrollEvent(&scroll1);
EXPECT_EQ(1, filter->num_scroll_events());
// Scroll event on a window should be dispatched properly.
- ui::ScrollEvent scroll2(ui::ET_SCROLL, gfx::Point(25, 30), now, 0, -10, 0, 2);
+ ui::ScrollEvent scroll2(ui::ET_SCROLL,
+ gfx::Point(25, 30),
+ now,
+ 0,
+ -10, 0,
+ -10, 0,
+ 2);
root_window()->AsRootWindowHostDelegate()->OnHostScrollEvent(&scroll2);
EXPECT_EQ(2, filter->num_scroll_events());
}