Index: ui/views/corewm/compound_event_filter_unittest.cc |
diff --git a/ui/views/corewm/compound_event_filter_unittest.cc b/ui/views/corewm/compound_event_filter_unittest.cc |
index fbeb2d3c6d821e148fca164794d4840cc4c77dc1..abc17b02b93f85b7d25cf3d7c699302dd3e700e6 100644 |
--- a/ui/views/corewm/compound_event_filter_unittest.cc |
+++ b/ui/views/corewm/compound_event_filter_unittest.cc |
@@ -65,36 +65,36 @@ TEST_F(CompoundEventFilterTest, CursorVisibilityChange) { |
// Send key event to hide the cursor. |
ui::KeyEvent key(ui::ET_KEY_PRESSED, ui::VKEY_A, 0, true); |
- dispatcher()->AsRootWindowHostDelegate()->OnHostKeyEvent(&key); |
+ dispatcher()->AsWindowTreeHostDelegate()->OnHostKeyEvent(&key); |
EXPECT_FALSE(cursor_client.IsCursorVisible()); |
// Synthesized mouse event should not show the cursor. |
ui::MouseEvent enter(ui::ET_MOUSE_ENTERED, gfx::Point(10, 10), |
gfx::Point(10, 10), 0, 0); |
enter.set_flags(enter.flags() | ui::EF_IS_SYNTHESIZED); |
- dispatcher()->AsRootWindowHostDelegate()->OnHostMouseEvent(&enter); |
+ dispatcher()->AsWindowTreeHostDelegate()->OnHostMouseEvent(&enter); |
EXPECT_FALSE(cursor_client.IsCursorVisible()); |
ui::MouseEvent move(ui::ET_MOUSE_MOVED, gfx::Point(10, 10), |
gfx::Point(10, 10), 0, 0); |
move.set_flags(enter.flags() | ui::EF_IS_SYNTHESIZED); |
- dispatcher()->AsRootWindowHostDelegate()->OnHostMouseEvent(&move); |
+ dispatcher()->AsWindowTreeHostDelegate()->OnHostMouseEvent(&move); |
EXPECT_FALSE(cursor_client.IsCursorVisible()); |
ui::MouseEvent real_move(ui::ET_MOUSE_MOVED, gfx::Point(10, 10), |
gfx::Point(10, 10), 0, 0); |
- dispatcher()->AsRootWindowHostDelegate()->OnHostMouseEvent(&real_move); |
+ dispatcher()->AsWindowTreeHostDelegate()->OnHostMouseEvent(&real_move); |
EXPECT_TRUE(cursor_client.IsCursorVisible()); |
// Send key event to hide the cursor again. |
- dispatcher()->AsRootWindowHostDelegate()->OnHostKeyEvent(&key); |
+ dispatcher()->AsWindowTreeHostDelegate()->OnHostKeyEvent(&key); |
EXPECT_FALSE(cursor_client.IsCursorVisible()); |
// Mouse synthesized exit event should not show the cursor. |
ui::MouseEvent exit(ui::ET_MOUSE_EXITED, gfx::Point(10, 10), |
gfx::Point(10, 10), 0, 0); |
exit.set_flags(enter.flags() | ui::EF_IS_SYNTHESIZED); |
- dispatcher()->AsRootWindowHostDelegate()->OnHostMouseEvent(&exit); |
+ dispatcher()->AsWindowTreeHostDelegate()->OnHostMouseEvent(&exit); |
EXPECT_FALSE(cursor_client.IsCursorVisible()); |
} |
#endif // defined(OS_CHROMEOS) |
@@ -114,29 +114,29 @@ TEST_F(CompoundEventFilterTest, TouchHidesCursor) { |
ui::MouseEvent mouse0(ui::ET_MOUSE_MOVED, gfx::Point(10, 10), |
gfx::Point(10, 10), 0, 0); |
- dispatcher()->AsRootWindowHostDelegate()->OnHostMouseEvent(&mouse0); |
+ dispatcher()->AsWindowTreeHostDelegate()->OnHostMouseEvent(&mouse0); |
EXPECT_TRUE(cursor_client.IsMouseEventsEnabled()); |
// This press is required for the GestureRecognizer to associate a target |
// with kTouchId |
ui::TouchEvent press0( |
ui::ET_TOUCH_PRESSED, gfx::Point(90, 90), 1, GetTime()); |
- dispatcher()->AsRootWindowHostDelegate()->OnHostTouchEvent(&press0); |
+ dispatcher()->AsWindowTreeHostDelegate()->OnHostTouchEvent(&press0); |
EXPECT_FALSE(cursor_client.IsMouseEventsEnabled()); |
ui::TouchEvent move(ui::ET_TOUCH_MOVED, gfx::Point(10, 10), 1, GetTime()); |
- dispatcher()->AsRootWindowHostDelegate()->OnHostTouchEvent(&move); |
+ dispatcher()->AsWindowTreeHostDelegate()->OnHostTouchEvent(&move); |
EXPECT_FALSE(cursor_client.IsMouseEventsEnabled()); |
ui::TouchEvent release( |
ui::ET_TOUCH_RELEASED, gfx::Point(10, 10), 1, GetTime()); |
- dispatcher()->AsRootWindowHostDelegate()->OnHostTouchEvent(&release); |
+ dispatcher()->AsWindowTreeHostDelegate()->OnHostTouchEvent(&release); |
EXPECT_FALSE(cursor_client.IsMouseEventsEnabled()); |
ui::MouseEvent mouse1(ui::ET_MOUSE_MOVED, gfx::Point(10, 10), |
gfx::Point(10, 10), 0, 0); |
// Move the cursor again. The cursor should be visible. |
- dispatcher()->AsRootWindowHostDelegate()->OnHostMouseEvent(&mouse1); |
+ dispatcher()->AsWindowTreeHostDelegate()->OnHostMouseEvent(&mouse1); |
EXPECT_TRUE(cursor_client.IsMouseEventsEnabled()); |
// Now activate the window and press on it again. |
@@ -144,7 +144,7 @@ TEST_F(CompoundEventFilterTest, TouchHidesCursor) { |
ui::ET_TOUCH_PRESSED, gfx::Point(90, 90), 1, GetTime()); |
aura::client::GetActivationClient( |
root_window())->ActivateWindow(window.get()); |
- dispatcher()->AsRootWindowHostDelegate()->OnHostTouchEvent(&press1); |
+ dispatcher()->AsWindowTreeHostDelegate()->OnHostTouchEvent(&press1); |
EXPECT_FALSE(cursor_client.IsMouseEventsEnabled()); |
aura::Env::GetInstance()->RemovePreTargetHandler(compound_filter.get()); |
} |