| Index: trunk/src/content/browser/web_contents/web_contents_view_aura_browsertest.cc
|
| ===================================================================
|
| --- trunk/src/content/browser/web_contents/web_contents_view_aura_browsertest.cc (revision 236091)
|
| +++ trunk/src/content/browser/web_contents/web_contents_view_aura_browsertest.cc (working copy)
|
| @@ -335,14 +335,14 @@
|
| ui::TouchEvent press(ui::ET_TOUCH_PRESSED,
|
| gfx::Point(bounds.x() + bounds.width() / 2, bounds.y() + 5),
|
| 0, timestamp);
|
| - dispatcher->AsWindowTreeHostDelegate()->OnHostTouchEvent(&press);
|
| + dispatcher->AsRootWindowHostDelegate()->OnHostTouchEvent(&press);
|
| EXPECT_EQ(1, GetCurrentIndex());
|
|
|
| timestamp += base::TimeDelta::FromMilliseconds(10);
|
| ui::TouchEvent move1(ui::ET_TOUCH_MOVED,
|
| gfx::Point(bounds.right() - 10, bounds.y() + 5),
|
| 0, timestamp);
|
| - dispatcher->AsWindowTreeHostDelegate()->OnHostTouchEvent(&move1);
|
| + dispatcher->AsRootWindowHostDelegate()->OnHostTouchEvent(&move1);
|
| EXPECT_EQ(1, GetCurrentIndex());
|
|
|
| // Swipe back from the right edge, back to the left edge, back to the right
|
| @@ -353,7 +353,7 @@
|
| ui::TouchEvent inc(ui::ET_TOUCH_MOVED,
|
| gfx::Point(x, bounds.y() + 5),
|
| 0, timestamp);
|
| - dispatcher->AsWindowTreeHostDelegate()->OnHostTouchEvent(&inc);
|
| + dispatcher->AsRootWindowHostDelegate()->OnHostTouchEvent(&inc);
|
| EXPECT_EQ(1, GetCurrentIndex());
|
| }
|
|
|
| @@ -362,7 +362,7 @@
|
| ui::TouchEvent inc(ui::ET_TOUCH_MOVED,
|
| gfx::Point(x, bounds.y() + 5),
|
| 0, timestamp);
|
| - dispatcher->AsWindowTreeHostDelegate()->OnHostTouchEvent(&inc);
|
| + dispatcher->AsRootWindowHostDelegate()->OnHostTouchEvent(&inc);
|
| EXPECT_EQ(1, GetCurrentIndex());
|
| }
|
|
|
| @@ -371,7 +371,7 @@
|
| ui::TouchEvent inc(ui::ET_TOUCH_MOVED,
|
| gfx::Point(x, bounds.y() + 5),
|
| 0, timestamp);
|
| - dispatcher->AsWindowTreeHostDelegate()->OnHostTouchEvent(&inc);
|
| + dispatcher->AsRootWindowHostDelegate()->OnHostTouchEvent(&inc);
|
| EXPECT_EQ(1, GetCurrentIndex());
|
| }
|
|
|
|
|