Index: ash/wm/system_gesture_event_filter_unittest.cc |
=================================================================== |
--- ash/wm/system_gesture_event_filter_unittest.cc (revision 148788) |
+++ ash/wm/system_gesture_event_filter_unittest.cc (working copy) |
@@ -147,7 +147,7 @@ |
// A touch outside the root window will be associated with the root window |
aura::TouchEvent press(ui::ET_TOUCH_PRESSED, gfx::Point(-10, -10), kTouchId, |
base::Time::NowFromSystemTime() - base::Time()); |
- root_window->DispatchTouchEvent(&press); |
+ root_window->AsRootWindowHostDelegate()->OnHostTouchEvent(&press); |
aura::GestureEvent* event = CreateGesture( |
ui::ET_GESTURE_TAP, 0, 0, 0, 0, kTouchId); |
@@ -205,7 +205,7 @@ |
gfx::Point(-10, ypos + ypos_half), |
kTouchId, |
base::Time::NowFromSystemTime() - base::Time()); |
- root_window->DispatchTouchEvent(&press1); |
+ root_window->AsRootWindowHostDelegate()->OnHostTouchEvent(&press1); |
aura::GestureEvent* event1 = CreateGesture( |
ui::ET_GESTURE_SCROLL_BEGIN, xpos, ypos, |
@@ -274,7 +274,7 @@ |
aura::TouchEvent release1(ui::ET_TOUCH_RELEASED, |
gfx::Point(2 * xpos, ypos + ypos_half), kTouchId, |
base::Time::NowFromSystemTime() - base::Time()); |
- root_window->DispatchTouchEvent(&release1); |
+ root_window->AsRootWindowHostDelegate()->OnHostTouchEvent(&release1); |
} |
} |
@@ -321,7 +321,7 @@ |
gfx::Point(-10, ypos + ypos_half), |
kTouchId, |
base::Time::NowFromSystemTime() - base::Time()); |
- root_window->DispatchTouchEvent(&press); |
+ root_window->AsRootWindowHostDelegate()->OnHostTouchEvent(&press); |
aura::GestureEvent* event1 = CreateGesture( |
ui::ET_GESTURE_SCROLL_BEGIN, xpos, ypos, |
@@ -371,7 +371,7 @@ |
aura::TouchEvent release(ui::ET_TOUCH_RELEASED, |
gfx::Point(2 * xpos, ypos + ypos_half), kTouchId, |
base::Time::NowFromSystemTime() - base::Time()); |
- root_window->DispatchTouchEvent(&release); |
+ root_window->AsRootWindowHostDelegate()->OnHostTouchEvent(&release); |
// Remove the launcher items again. |
TestLauncherDelegate::instance()->OnWillRemoveWindow(window1.get()); |
@@ -402,7 +402,7 @@ |
// Send touch event to first window. |
aura::TouchEvent press(ui::ET_TOUCH_PRESSED, gfx::Point(10, 10), kTouchId, |
base::Time::NowFromSystemTime() - base::Time()); |
- root_window->DispatchTouchEvent(&press); |
+ root_window->AsRootWindowHostDelegate()->OnHostTouchEvent(&press); |
EXPECT_TRUE(window1->HasCapture()); |
base::OneShotTimer<internal::LongPressAffordanceAnimation>* timer = |