| Index: ui/views/widget/widget_unittest.cc
|
| diff --git a/ui/views/widget/widget_unittest.cc b/ui/views/widget/widget_unittest.cc
|
| index 4196da64d6acfa71743490e6e0ac57bc2fb1755d..3bd263563121ef846837ea70256d96b18d9756cf 100644
|
| --- a/ui/views/widget/widget_unittest.cc
|
| +++ b/ui/views/widget/widget_unittest.cc
|
| @@ -1291,8 +1291,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;
|
| @@ -2055,7 +2055,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();
|
| @@ -2082,7 +2082,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
|
| @@ -2094,7 +2094,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();
|
|
|