diff options
Diffstat (limited to 'ui/views/widget/widget_unittest.cc')
| -rw-r--r-- | ui/views/widget/widget_unittest.cc | 12 |
1 files changed, 6 insertions, 6 deletions
diff --git a/ui/views/widget/widget_unittest.cc b/ui/views/widget/widget_unittest.cc index 71745d0..a19cfcd 100644 --- a/ui/views/widget/widget_unittest.cc +++ b/ui/views/widget/widget_unittest.cc @@ -1220,7 +1220,7 @@ TEST_F(WidgetTest, DesktopAuraTopLevelOwnedPopupTest) { #if defined(OS_WIN) // TODO(ananta) // Fix this test to work on Linux Aura. Need to implement the -// views::DesktopRootWindowHostX11::SetSize function +// views::DesktopWindowTreeHostX11::SetSize function // This test validates that when a top level owned popup Aura window is // resized, the widget is resized as well. TEST_F(WidgetTest, DesktopAuraTopLevelOwnedPopupResizeTest) { @@ -1322,8 +1322,8 @@ void GenerateMouseEvents(Widget* widget, ui::EventType last_event_type) { const gfx::Rect screen_bounds(widget->GetWindowBoundsInScreen()); ui::MouseEvent move_event(ui::ET_MOUSE_MOVED, screen_bounds.CenterPoint(), screen_bounds.CenterPoint(), 0, 0); - aura::RootWindowHostDelegate* rwhd = - widget->GetNativeWindow()->GetDispatcher()->AsRootWindowHostDelegate(); + aura::WindowTreeHostDelegate* rwhd = + widget->GetNativeWindow()->GetDispatcher()->AsWindowTreeHostDelegate(); rwhd->OnHostMouseEvent(&move_event); if (last_event_type == ui::ET_MOUSE_ENTERED) return; @@ -2086,7 +2086,7 @@ TEST_F(WidgetTest, WindowMouseModalityTest) { ui::EF_NONE, ui::EF_NONE); top_level_widget.GetNativeView()->GetDispatcher()-> - AsRootWindowHostDelegate()->OnHostMouseEvent(&move_main); + AsWindowTreeHostDelegate()->OnHostMouseEvent(&move_main); EXPECT_EQ(1, widget_view->GetEventCount(ui::ET_MOUSE_ENTERED)); widget_view->ResetCounts(); @@ -2113,7 +2113,7 @@ TEST_F(WidgetTest, WindowMouseModalityTest) { ui::EF_NONE, ui::EF_NONE); top_level_widget.GetNativeView()->GetDispatcher()-> - AsRootWindowHostDelegate()->OnHostMouseEvent(&mouse_down_dialog); + AsWindowTreeHostDelegate()->OnHostMouseEvent(&mouse_down_dialog); EXPECT_EQ(1, dialog_widget_view->GetEventCount(ui::ET_MOUSE_PRESSED)); // Send a mouse move message to the main window. It should not be received by @@ -2125,7 +2125,7 @@ TEST_F(WidgetTest, WindowMouseModalityTest) { ui::EF_NONE, ui::EF_NONE); top_level_widget.GetNativeView()->GetDispatcher()-> - AsRootWindowHostDelegate()->OnHostMouseEvent(&mouse_down_main); + AsWindowTreeHostDelegate()->OnHostMouseEvent(&mouse_down_main); EXPECT_EQ(0, widget_view->GetEventCount(ui::ET_MOUSE_MOVED)); modal_dialog_widget->CloseNow(); |