| Index: trunk/src/ui/views/widget/native_widget_aura_unittest.cc
|
| ===================================================================
|
| --- trunk/src/ui/views/widget/native_widget_aura_unittest.cc (revision 236092)
|
| +++ trunk/src/ui/views/widget/native_widget_aura_unittest.cc (working copy)
|
| @@ -258,7 +258,7 @@
|
|
|
| ui::TouchEvent press(ui::ET_TOUCH_PRESSED, gfx::Point(41, 51), 1,
|
| base::TimeDelta());
|
| - dispatcher()->AsWindowTreeHostDelegate()->OnHostTouchEvent(&press);
|
| + dispatcher()->AsRootWindowHostDelegate()->OnHostTouchEvent(&press);
|
| // Both views should get the press.
|
| EXPECT_TRUE(view->got_gesture_event());
|
| EXPECT_TRUE(child->got_gesture_event());
|
| @@ -271,7 +271,7 @@
|
| // the press.
|
| ui::TouchEvent release(ui::ET_TOUCH_RELEASED, gfx::Point(250, 251), 1,
|
| base::TimeDelta());
|
| - dispatcher()->AsWindowTreeHostDelegate()->OnHostTouchEvent(&release);
|
| + dispatcher()->AsRootWindowHostDelegate()->OnHostTouchEvent(&release);
|
| EXPECT_TRUE(view->got_gesture_event());
|
| EXPECT_FALSE(child->got_gesture_event());
|
| view->clear_got_gesture_event();
|
| @@ -294,7 +294,7 @@
|
|
|
| ui::TouchEvent press(ui::ET_TOUCH_PRESSED, gfx::Point(41, 51), 1,
|
| base::TimeDelta());
|
| - dispatcher()->AsWindowTreeHostDelegate()->OnHostTouchEvent(&press);
|
| + dispatcher()->AsRootWindowHostDelegate()->OnHostTouchEvent(&press);
|
| EXPECT_TRUE(view->got_gesture_event());
|
| view->clear_got_gesture_event();
|
| // Set the capture.
|
| @@ -304,7 +304,7 @@
|
| // Generate a release, this should trigger releasing capture.
|
| ui::TouchEvent release(ui::ET_TOUCH_RELEASED, gfx::Point(41, 51), 1,
|
| base::TimeDelta());
|
| - dispatcher()->AsWindowTreeHostDelegate()->OnHostTouchEvent(&release);
|
| + dispatcher()->AsRootWindowHostDelegate()->OnHostTouchEvent(&release);
|
| EXPECT_TRUE(view->got_gesture_event());
|
| view->clear_got_gesture_event();
|
| EXPECT_FALSE(widget->HasCapture());
|
|
|